Anonymous | Login | Signup for a new account | 2021-01-28 02:41 PST | ![]() |
Main | My View | View Issues | Change Log | Roadmap | Summary | My Account |
View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] | |||||||||
ID | Project | Category | View Status | Date Submitted | Last Update | |||||
0005028 | opensim | [REGION] Scripting Engine | public | 2010-09-06 11:29 | 2011-10-21 19:16 | |||||
Reporter | player | |||||||||
Assigned To | ||||||||||
Priority | normal | Severity | tweak | Reproducibility | always | |||||
Status | patch included | Resolution | open | |||||||
Platform | Operating System | Operating System Version | ||||||||
Product Version | ||||||||||
Target Version | Fixed in Version | |||||||||
Summary | 0005028: Functions should accept expressions as numeric values | |||||||||
Description | In LL's LSL functions can accept boolean expressions in place of integer or float values. OSSL currently can't. For example expressions like the following ones are compiled successfully in SL: llAbs(1 != 0); // integer expected llCeil("huh" == "DUH!"); // float expected We can't overload those functions as the calls would become ambiguous. However, seeing how LSL_Integer and LSL_Float types can implicitly cast to System.Boolean, I'd suggest to change the LSL and OSSL stubs as I did in the included patch, if there are no side-effects. | |||||||||
Additional Information | Mono version 2.6.4 64-bit for Fedora 13 OpenSim version 0.7.0.1 | |||||||||
Tags | No tags attached. | |||||||||
Git Revision or version number | 0 | |||||||||
Run Mode | Standalone (1 Region) | |||||||||
Physics Engine | BasicPhysics | |||||||||
Script Engine | ||||||||||
Environment | Mono / Linux64 | |||||||||
Mono Version | Other | |||||||||
Viewer | ||||||||||
Attached Files | ![]() --- ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs.bak 2010-09-06 19:07:53.821791924 +0200 +++ ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs 2010-09-06 19:14:54.793545596 +0200 @@ -61,17 +61,17 @@ namespace OpenSim.Region.ScriptEngine.Sh Prim = new OSSLPrim(this); } - public void osSetRegionWaterHeight(double height) + public void osSetRegionWaterHeight(LSL_Float height) { m_OSSL_Functions.osSetRegionWaterHeight(height); } - public void osSetRegionSunSettings(bool useEstateSun, bool sunFixed, double sunHour) + public void osSetRegionSunSettings(LSL_Integer useEstateSun, LSL_Integer sunFixed, LSL_Float sunHour) { m_OSSL_Functions.osSetRegionSunSettings(useEstateSun, sunFixed, sunHour); } - public void osSetEstateSunSettings(bool sunFixed, double sunHour) + public void osSetEstateSunSettings(LSL_Integer sunFixed, LSL_Float sunHour) { m_OSSL_Functions.osSetEstateSunSettings(sunFixed, sunHour); } @@ -86,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osSunGetParam(param); } - public void osSunSetParam(string param, double value) + public void osSunSetParam(string param, LSL_Float value) { m_OSSL_Functions.osSunSetParam(param, value); } @@ -116,61 +116,61 @@ namespace OpenSim.Region.ScriptEngine.Sh { m_OSSL_Functions.osParcelSubdivide(pos1, pos2); } - + public void osParcelSetDetails(vector pos, LSL_List rules) { m_OSSL_Functions.osParcelSetDetails(pos,rules); } - public double osList2Double(LSL_Types.list src, int index) + public double osList2Double(LSL_Types.list src, LSL_Integer index) { return m_OSSL_Functions.osList2Double(src, index); } public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, - int timer) + LSL_Integer timer) { return m_OSSL_Functions.osSetDynamicTextureURL(dynamicID, contentType, url, extraParams, timer); } public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, - int timer) + LSL_Integer timer) { return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer); } public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, - int timer, int alpha) + LSL_Integer timer, LSL_Integer alpha) { return m_OSSL_Functions.osSetDynamicTextureURLBlend(dynamicID, contentType, url, extraParams, timer, alpha); } public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, - int timer, int alpha) + LSL_Integer timer, LSL_Integer alpha) { return m_OSSL_Functions.osSetDynamicTextureDataBlend(dynamicID, contentType, data, extraParams, timer, alpha); } public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, - bool blend, int disp, int timer, int alpha, int face) + LSL_Integer blend, LSL_Integer disp, LSL_Integer timer, LSL_Integer alpha, LSL_Integer face) { return m_OSSL_Functions.osSetDynamicTextureURLBlendFace(dynamicID, contentType, url, extraParams, blend, disp, timer, alpha, face); } public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, - bool blend, int disp, int timer, int alpha, int face) + LSL_Integer blend, LSL_Integer disp, LSL_Integer timer, LSL_Integer alpha, LSL_Integer face) { return m_OSSL_Functions.osSetDynamicTextureDataBlendFace(dynamicID, contentType, data, extraParams, blend, disp, timer, alpha, face); } - public LSL_Float osTerrainGetHeight(int x, int y) + public LSL_Float osTerrainGetHeight(LSL_Integer x, LSL_Integer y) { return m_OSSL_Functions.osTerrainGetHeight(x, y); } - public LSL_Integer osTerrainSetHeight(int x, int y, double val) + public LSL_Integer osTerrainSetHeight(LSL_Integer x, LSL_Integer y, LSL_Float val) { return m_OSSL_Functions.osTerrainSetHeight(x, y, val); } @@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osTerrainFlush(); } - public int osRegionRestart(double seconds) + public int osRegionRestart(LSL_Float seconds) { return m_OSSL_Functions.osRegionRestart(seconds); } @@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osSetParcelSIPAddress(SIPAddress); } - public void osSetPrimFloatOnWater(int floatYN) + public void osSetPrimFloatOnWater(LSL_Integer floatYN) { m_OSSL_Functions.osSetPrimFloatOnWater(floatYN); } @@ -217,7 +217,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat); } - public void osTeleportAgent(string agent, int regionX, int regionY, vector position, vector lookat) + public void osTeleportAgent(string agent, LSL_Integer regionX, LSL_Integer regionY, vector position, vector lookat) { m_OSSL_Functions.osTeleportAgent(agent, regionX, regionY, position, lookat); } @@ -253,17 +253,17 @@ namespace OpenSim.Region.ScriptEngine.Sh //Texture Draw functions - public string osMovePen(string drawList, int x, int y) + public string osMovePen(string drawList, LSL_Integer x, LSL_Integer y) { return m_OSSL_Functions.osMovePen(drawList, x, y); } - public string osDrawLine(string drawList, int startX, int startY, int endX, int endY) + public string osDrawLine(string drawList, LSL_Integer startX, LSL_Integer startY, LSL_Integer endX, LSL_Integer endY) { return m_OSSL_Functions.osDrawLine(drawList, startX, startY, endX, endY); } - public string osDrawLine(string drawList, int endX, int endY) + public string osDrawLine(string drawList, LSL_Integer endX, LSL_Integer endY) { return m_OSSL_Functions.osDrawLine(drawList, endX, endY); } @@ -273,17 +273,17 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osDrawText(drawList, text); } - public string osDrawEllipse(string drawList, int width, int height) + public string osDrawEllipse(string drawList, LSL_Integer width, LSL_Integer height) { return m_OSSL_Functions.osDrawEllipse(drawList, width, height); } - public string osDrawRectangle(string drawList, int width, int height) + public string osDrawRectangle(string drawList, LSL_Integer width, LSL_Integer height) { return m_OSSL_Functions.osDrawRectangle(drawList, width, height); } - public string osDrawFilledRectangle(string drawList, int width, int height) + public string osDrawFilledRectangle(string drawList, LSL_Integer width, LSL_Integer height) { return m_OSSL_Functions.osDrawFilledRectangle(drawList, width, height); } @@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y); } - public string osSetFontSize(string drawList, int fontSize) + public string osSetFontSize(string drawList, LSL_Integer fontSize) { return m_OSSL_Functions.osSetFontSize(drawList, fontSize); } @@ -308,7 +308,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osSetFontName(drawList, fontName); } - public string osSetPenSize(string drawList, int penSize) + public string osSetPenSize(string drawList, LSL_Integer penSize) { return m_OSSL_Functions.osSetPenSize(drawList, penSize); } @@ -323,17 +323,17 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osSetPenColour(drawList, colour); } - public string osDrawImage(string drawList, int width, int height, string imageUrl) + public string osDrawImage(string drawList, LSL_Integer width, LSL_Integer height, string imageUrl) { return m_OSSL_Functions.osDrawImage(drawList, width, height, imageUrl); } - public vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize) + public vector osGetDrawStringSize(string contentType, string text, string fontName, LSL_Integer fontSize) { return m_OSSL_Functions.osGetDrawStringSize(contentType, text, fontName, fontSize); } - public void osSetStateEvents(int events) + public void osSetStateEvents(LSL_Integer events) { m_OSSL_Functions.osSetStateEvents(events); } @@ -363,7 +363,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osMakeNotecard(notecardName, contents); } - public string osGetNotecardLine(string name, int line) + public string osGetNotecardLine(string name, LSL_Integer line) { return m_OSSL_Functions.osGetNotecardLine(name, line); } @@ -408,7 +408,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osFormatString(str, strings); } - public LSL_List osMatchString(string src, string pattern, int start) + public LSL_List osMatchString(string src, string pattern, LSL_Integer start) { return m_OSSL_Functions.osMatchString(src, pattern, start); } @@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osLoadedCreationID(); } - public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules) + public LSL_List osGetLinkPrimitiveParams(LSL_Integer linknumber, LSL_List rules) { return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules); } @@ -648,7 +648,7 @@ namespace OpenSim.Region.ScriptEngine.Sh { return m_OSSL_Functions.osGetRegionMapTexture(regionName); } - + public LSL_List osGetRegionStats() { return m_OSSL_Functions.osGetRegionStats(); @@ -667,15 +667,15 @@ namespace OpenSim.Region.ScriptEngine.Sh { m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); } - public void osSetSpeed(string UUID, float SpeedModifier) + public void osSetSpeed(string UUID, LSL_Float SpeedModifier) { - m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); + m_OSSL_Functions.osSetSpeed(UUID, (float)((double)SpeedModifier)); } - public void osCauseDamage(string avatar, double damage) + public void osCauseDamage(string avatar, LSL_Float damage) { m_OSSL_Functions.osCauseDamage(avatar, damage); } - public void osCauseHealing(string avatar, double healing) + public void osCauseHealing(string avatar, LSL_Float healing) { m_OSSL_Functions.osCauseHealing(avatar, healing); } --- ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs.bak 2010-09-06 17:18:51.597547133 +0200 +++ ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs 2010-09-06 19:03:34.945536377 +0200 @@ -64,32 +64,32 @@ namespace OpenSim.Region.ScriptEngine.Sh // // Script functions // - public LSL_Integer llAbs(int i) + public LSL_Integer llAbs(LSL_Integer i) { return m_LSL_Functions.llAbs(i); } - public LSL_Float llAcos(double val) + public LSL_Float llAcos(LSL_Float val) { return m_LSL_Functions.llAcos(val); } - public void llAddToLandBanList(string avatar, double hours) + public void llAddToLandBanList(string avatar, LSL_Float hours) { m_LSL_Functions.llAddToLandBanList(avatar, hours); } - public void llAddToLandPassList(string avatar, double hours) + public void llAddToLandPassList(string avatar, LSL_Float hours) { m_LSL_Functions.llAddToLandPassList(avatar, hours); } - public void llAdjustSoundVolume(double volume) + public void llAdjustSoundVolume(LSL_Float volume) { m_LSL_Functions.llAdjustSoundVolume(volume); } - public void llAllowInventoryDrop(int add) + public void llAllowInventoryDrop(LSL_Integer add) { m_LSL_Functions.llAllowInventoryDrop(add); } @@ -99,27 +99,27 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llAngleBetween(a, b); } - public void llApplyImpulse(LSL_Vector force, int local) + public void llApplyImpulse(LSL_Vector force, LSL_Integer local) { m_LSL_Functions.llApplyImpulse(force, local); } - public void llApplyRotationalImpulse(LSL_Vector force, int local) + public void llApplyRotationalImpulse(LSL_Vector force, LSL_Integer local) { m_LSL_Functions.llApplyRotationalImpulse(force, local); } - public LSL_Float llAsin(double val) + public LSL_Float llAsin(LSL_Float val) { return m_LSL_Functions.llAsin(val); } - public LSL_Float llAtan2(double x, double y) + public LSL_Float llAtan2(LSL_Float x, LSL_Float y) { return m_LSL_Functions.llAtan2(x, y); } - public void llAttachToAvatar(int attachment) + public void llAttachToAvatar(LSL_Integer attachment) { m_LSL_Functions.llAttachToAvatar(attachment); } @@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llAxes2Rot(fwd, left, up); } - public LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, double angle) + public LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, LSL_Float angle) { return m_LSL_Functions.llAxisAngle2Rot(axis, angle); } @@ -154,12 +154,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llBreakAllLinks(); } - public void llBreakLink(int linknum) + public void llBreakLink(LSL_Integer linknum) { m_LSL_Functions.llBreakLink(linknum); } - public LSL_Integer llCeil(double f) + public LSL_Integer llCeil(LSL_Float f) { return m_LSL_Functions.llCeil(f); } @@ -179,12 +179,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llCloud(offset); } - public void llCollisionFilter(string name, string id, int accept) + public void llCollisionFilter(string name, string id, LSL_Integer accept) { m_LSL_Functions.llCollisionFilter(name, id, accept); } - public void llCollisionSound(string impact_sound, double impact_volume) + public void llCollisionSound(string impact_sound, LSL_Float impact_volume) { m_LSL_Functions.llCollisionSound(impact_sound, impact_volume); } @@ -194,12 +194,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llCollisionSprite(impact_sprite); } - public LSL_Float llCos(double f) + public LSL_Float llCos(LSL_Float f) { return m_LSL_Functions.llCos(f); } - public void llCreateLink(string target, int parent) + public void llCreateLink(string target, LSL_Integer parent) { m_LSL_Functions.llCreateLink(target, parent); } @@ -209,12 +209,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llCSV2List(src); } - public LSL_List llDeleteSubList(LSL_List src, int start, int end) + public LSL_List llDeleteSubList(LSL_List src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llDeleteSubList(src, start, end); } - public LSL_String llDeleteSubString(string src, int start, int end) + public LSL_String llDeleteSubString(string src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llDeleteSubString(src, start, end); } @@ -224,87 +224,87 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llDetachFromAvatar(); } - public LSL_Vector llDetectedGrab(int number) + public LSL_Vector llDetectedGrab(LSL_Integer number) { return m_LSL_Functions.llDetectedGrab(number); } - public LSL_Integer llDetectedGroup(int number) + public LSL_Integer llDetectedGroup(LSL_Integer number) { return m_LSL_Functions.llDetectedGroup(number); } - public LSL_Key llDetectedKey(int number) + public LSL_Key llDetectedKey(LSL_Integer number) { return m_LSL_Functions.llDetectedKey(number); } - public LSL_Integer llDetectedLinkNumber(int number) + public LSL_Integer llDetectedLinkNumber(LSL_Integer number) { return m_LSL_Functions.llDetectedLinkNumber(number); } - public LSL_String llDetectedName(int number) + public LSL_String llDetectedName(LSL_Integer number) { return m_LSL_Functions.llDetectedName(number); } - public LSL_Key llDetectedOwner(int number) + public LSL_Key llDetectedOwner(LSL_Integer number) { return m_LSL_Functions.llDetectedOwner(number); } - public LSL_Vector llDetectedPos(int number) + public LSL_Vector llDetectedPos(LSL_Integer number) { return m_LSL_Functions.llDetectedPos(number); } - public LSL_Rotation llDetectedRot(int number) + public LSL_Rotation llDetectedRot(LSL_Integer number) { return m_LSL_Functions.llDetectedRot(number); } - public LSL_Integer llDetectedType(int number) + public LSL_Integer llDetectedType(LSL_Integer number) { return m_LSL_Functions.llDetectedType(number); } - public LSL_Vector llDetectedTouchBinormal(int index) + public LSL_Vector llDetectedTouchBinormal(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchBinormal(index); } - public LSL_Integer llDetectedTouchFace(int index) + public LSL_Integer llDetectedTouchFace(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchFace(index); } - public LSL_Vector llDetectedTouchNormal(int index) + public LSL_Vector llDetectedTouchNormal(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchNormal(index); } - public LSL_Vector llDetectedTouchPos(int index) + public LSL_Vector llDetectedTouchPos(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchPos(index); } - public LSL_Vector llDetectedTouchST(int index) + public LSL_Vector llDetectedTouchST(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchST(index); } - public LSL_Vector llDetectedTouchUV(int index) + public LSL_Vector llDetectedTouchUV(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchUV(index); } - public LSL_Vector llDetectedVel(int number) + public LSL_Vector llDetectedVel(LSL_Integer number) { return m_LSL_Functions.llDetectedVel(number); } - public void llDialog(string avatar, string message, LSL_List buttons, int chat_channel) + public void llDialog(string avatar, string message, LSL_List buttons, LSL_Integer chat_channel) { m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); } @@ -344,22 +344,22 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llEuler2Rot(v); } - public LSL_Float llFabs(double f) + public LSL_Float llFabs(LSL_Float f) { return m_LSL_Functions.llFabs(f); } - public LSL_Integer llFloor(double f) + public LSL_Integer llFloor(LSL_Float f) { return m_LSL_Functions.llFloor(f); } - public void llForceMouselook(int mouselook) + public void llForceMouselook(LSL_Integer mouselook) { m_LSL_Functions.llForceMouselook(mouselook); } - public LSL_Float llFrand(double mag) + public LSL_Float llFrand(LSL_Float mag) { return m_LSL_Functions.llFrand(mag); } @@ -384,7 +384,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetAgentSize(id); } - public LSL_Float llGetAlpha(int face) + public LSL_Float llGetAlpha(LSL_Integer face) { return m_LSL_Functions.llGetAlpha(face); } @@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetCenterOfMass(); } - public LSL_Vector llGetColor(int face) + public LSL_Vector llGetColor(LSL_Integer face) { return m_LSL_Functions.llGetColor(face); } @@ -489,17 +489,17 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetInventoryKey(name); } - public LSL_String llGetInventoryName(int type, int number) + public LSL_String llGetInventoryName(LSL_Integer type, LSL_Integer number) { return m_LSL_Functions.llGetInventoryName(type, number); } - public LSL_Integer llGetInventoryNumber(int type) + public LSL_Integer llGetInventoryNumber(LSL_Integer type) { return m_LSL_Functions.llGetInventoryNumber(type); } - public LSL_Integer llGetInventoryPermMask(string item, int mask) + public LSL_Integer llGetInventoryPermMask(string item, LSL_Integer mask) { return m_LSL_Functions.llGetInventoryPermMask(item, mask); } @@ -519,12 +519,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetLandOwnerAt(pos); } - public LSL_Key llGetLinkKey(int linknum) + public LSL_Key llGetLinkKey(LSL_Integer linknum) { return m_LSL_Functions.llGetLinkKey(linknum); } - public LSL_String llGetLinkName(int linknum) + public LSL_String llGetLinkName(LSL_Integer linknum) { return m_LSL_Functions.llGetLinkName(linknum); } @@ -534,7 +534,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetLinkNumber(); } - public LSL_Integer llGetListEntryType(LSL_List src, int index) + public LSL_Integer llGetListEntryType(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llGetListEntryType(src, index); } @@ -564,7 +564,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llGetNextEmail(address, subject); } - public LSL_String llGetNotecardLine(string name, int line) + public LSL_String llGetNotecardLine(string name, LSL_Integer line) { return m_LSL_Functions.llGetNotecardLine(name, line); } @@ -604,7 +604,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetObjectName(); } - public LSL_Integer llGetObjectPermMask(int mask) + public LSL_Integer llGetObjectPermMask(LSL_Integer mask) { return m_LSL_Functions.llGetObjectPermMask(mask); } @@ -639,12 +639,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetParcelFlags(pos); } - public LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, int sim_wide) + public LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, LSL_Integer sim_wide) { return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); } - public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) + public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, LSL_Integer category, LSL_Integer sim_wide) { return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); } @@ -674,7 +674,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetPrimitiveParams(rules); } - public LSL_List llGetLinkPrimitiveParams(int linknum, LSL_List rules) + public LSL_List llGetLinkPrimitiveParams(LSL_Integer linknum, LSL_List rules) { return m_LSL_Functions.llGetLinkPrimitiveParams(linknum, rules); } @@ -749,12 +749,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetStartParameter(); } - public LSL_Integer llGetStatus(int status) + public LSL_Integer llGetStatus(LSL_Integer status) { return m_LSL_Functions.llGetStatus(status); } - public LSL_String llGetSubString(string src, int start, int end) + public LSL_String llGetSubString(string src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llGetSubString(src, start, end); } @@ -764,22 +764,22 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetSunDirection(); } - public LSL_String llGetTexture(int face) + public LSL_String llGetTexture(LSL_Integer face) { return m_LSL_Functions.llGetTexture(face); } - public LSL_Vector llGetTextureOffset(int face) + public LSL_Vector llGetTextureOffset(LSL_Integer face) { return m_LSL_Functions.llGetTextureOffset(face); } - public LSL_Float llGetTextureRot(int side) + public LSL_Float llGetTextureRot(LSL_Integer side) { return m_LSL_Functions.llGetTextureRot(side); } - public LSL_Vector llGetTextureScale(int side) + public LSL_Vector llGetTextureScale(LSL_Integer side) { return m_LSL_Functions.llGetTextureScale(side); } @@ -829,7 +829,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llGiveInventoryList(destination, category, inventory); } - public LSL_Integer llGiveMoney(string destination, int amount) + public LSL_Integer llGiveMoney(string destination, LSL_Integer amount) { return m_LSL_Functions.llGiveMoney(destination, amount); } @@ -854,7 +854,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGroundNormal(offset); } - public void llGroundRepel(double height, int water, double tau) + public void llGroundRepel(LSL_Float height, LSL_Integer water, LSL_Float tau) { m_LSL_Functions.llGroundRepel(height, water, tau); } @@ -869,12 +869,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llHTTPRequest(url, parameters, body); } - public void llHTTPResponse(LSL_Key id, int status, string body) + public void llHTTPResponse(LSL_Key id, LSL_Integer status, string body) { m_LSL_Functions.llHTTPResponse(id, status, body); } - public LSL_String llInsertString(string dst, int position, string src) + public LSL_String llInsertString(string dst, LSL_Integer position, string src) { return m_LSL_Functions.llInsertString(dst, position, src); } @@ -884,7 +884,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llInstantMessage(user, message); } - public LSL_String llIntegerToBase64(int number) + public LSL_String llIntegerToBase64(LSL_Integer number) { return m_LSL_Functions.llIntegerToBase64(number); } @@ -894,7 +894,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llKey2Name(id); } - public void llLinkParticleSystem(int linknum, LSL_List rules) + public void llLinkParticleSystem(LSL_Integer linknum, LSL_List rules) { m_LSL_Functions.llLinkParticleSystem(linknum, rules); } @@ -904,57 +904,57 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llList2CSV(src); } - public LSL_Float llList2Float(LSL_List src, int index) + public LSL_Float llList2Float(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Float(src, index); } - public LSL_Integer llList2Integer(LSL_List src, int index) + public LSL_Integer llList2Integer(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Integer(src, index); } - public LSL_Key llList2Key(LSL_List src, int index) + public LSL_Key llList2Key(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Key(src, index); } - public LSL_List llList2List(LSL_List src, int start, int end) + public LSL_List llList2List(LSL_List src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llList2List(src, start, end); } - public LSL_List llList2ListStrided(LSL_List src, int start, int end, int stride) + public LSL_List llList2ListStrided(LSL_List src, LSL_Integer start, LSL_Integer end, LSL_Integer stride) { return m_LSL_Functions.llList2ListStrided(src, start, end, stride); } - public LSL_Rotation llList2Rot(LSL_List src, int index) + public LSL_Rotation llList2Rot(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Rot(src, index); } - public LSL_String llList2String(LSL_List src, int index) + public LSL_String llList2String(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2String(src, index); } - public LSL_Vector llList2Vector(LSL_List src, int index) + public LSL_Vector llList2Vector(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Vector(src, index); } - public LSL_Integer llListen(int channelID, string name, string ID, string msg) + public LSL_Integer llListen(LSL_Integer channelID, string name, string ID, string msg) { return m_LSL_Functions.llListen(channelID, name, ID, msg); } - public void llListenControl(int number, int active) + public void llListenControl(LSL_Integer number, LSL_Integer active) { m_LSL_Functions.llListenControl(number, active); } - public void llListenRemove(int number) + public void llListenRemove(LSL_Integer number) { m_LSL_Functions.llListenRemove(number); } @@ -964,27 +964,27 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llListFindList(src, test); } - public LSL_List llListInsertList(LSL_List dest, LSL_List src, int start) + public LSL_List llListInsertList(LSL_List dest, LSL_List src, LSL_Integer start) { return m_LSL_Functions.llListInsertList(dest, src, start); } - public LSL_List llListRandomize(LSL_List src, int stride) + public LSL_List llListRandomize(LSL_List src, LSL_Integer stride) { return m_LSL_Functions.llListRandomize(src, stride); } - public LSL_List llListReplaceList(LSL_List dest, LSL_List src, int start, int end) + public LSL_List llListReplaceList(LSL_List dest, LSL_List src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llListReplaceList(dest, src, start, end); } - public LSL_List llListSort(LSL_List src, int stride, int ascending) + public LSL_List llListSort(LSL_List src, LSL_Integer stride, LSL_Integer ascending) { return m_LSL_Functions.llListSort(src, stride, ascending); } - public LSL_Float llListStatistics(int operation, LSL_List src) + public LSL_Float llListStatistics(LSL_Integer operation, LSL_List src) { return m_LSL_Functions.llListStatistics(operation, src); } @@ -994,52 +994,52 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llLoadURL(avatar_id, message, url); } - public LSL_Float llLog(double val) + public LSL_Float llLog(LSL_Float val) { return m_LSL_Functions.llLog(val); } - public LSL_Float llLog10(double val) + public LSL_Float llLog10(LSL_Float val) { return m_LSL_Functions.llLog10(val); } - public void llLookAt(LSL_Vector target, double strength, double damping) + public void llLookAt(LSL_Vector target, LSL_Float strength, LSL_Float damping) { m_LSL_Functions.llLookAt(target, strength, damping); } - public void llLoopSound(string sound, double volume) + public void llLoopSound(string sound, LSL_Float volume) { m_LSL_Functions.llLoopSound(sound, volume); } - public void llLoopSoundMaster(string sound, double volume) + public void llLoopSoundMaster(string sound, LSL_Float volume) { m_LSL_Functions.llLoopSoundMaster(sound, volume); } - public void llLoopSoundSlave(string sound, double volume) + public void llLoopSoundSlave(string sound, LSL_Float volume) { m_LSL_Functions.llLoopSoundSlave(sound, volume); } - public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) + public void llMakeExplosion(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, string texture, LSL_Vector offset) { m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset); } - public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) + public void llMakeFire(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, string texture, LSL_Vector offset) { m_LSL_Functions.llMakeFire(particles, scale, vel, lifetime, arc, texture, offset); } - public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) + public void llMakeFountain(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, LSL_Integer bounce, string texture, LSL_Vector offset, LSL_Float bounce_offset) { m_LSL_Functions.llMakeFountain(particles, scale, vel, lifetime, arc, bounce, texture, offset, bounce_offset); } - public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) + public void llMakeSmoke(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, string texture, LSL_Vector offset) { m_LSL_Functions.llMakeSmoke(particles, scale, vel, lifetime, arc, texture, offset); } @@ -1049,7 +1049,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llMapDestination(simname, pos, look_at); } - public LSL_String llMD5String(string src, int nonce) + public LSL_String llMD5String(string src, LSL_Integer nonce) { return m_LSL_Functions.llMD5String(src, nonce); } @@ -1059,32 +1059,32 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llSHA1String(src); } - public void llMessageLinked(int linknum, int num, string str, string id) + public void llMessageLinked(LSL_Integer linknum, LSL_Integer num, string str, string id) { m_LSL_Functions.llMessageLinked(linknum, num, str, id); } - public void llMinEventDelay(double delay) + public void llMinEventDelay(LSL_Float delay) { m_LSL_Functions.llMinEventDelay(delay); } - public void llModifyLand(int action, int brush) + public void llModifyLand(LSL_Integer action, LSL_Integer brush) { m_LSL_Functions.llModifyLand(action, brush); } - public LSL_Integer llModPow(int a, int b, int c) + public LSL_Integer llModPow(LSL_Integer a, LSL_Integer b, LSL_Integer c) { return m_LSL_Functions.llModPow(a, b, c); } - public void llMoveToTarget(LSL_Vector target, double tau) + public void llMoveToTarget(LSL_Vector target, LSL_Float tau) { m_LSL_Functions.llMoveToTarget(target, tau); } - public void llOffsetTexture(double u, double v, int face) + public void llOffsetTexture(LSL_Float u, LSL_Float v, LSL_Integer face) { m_LSL_Functions.llOffsetTexture(u, v, face); } @@ -1129,22 +1129,22 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llParticleSystem(rules); } - public void llPassCollisions(int pass) + public void llPassCollisions(LSL_Integer pass) { m_LSL_Functions.llPassCollisions(pass); } - public void llPassTouches(int pass) + public void llPassTouches(LSL_Integer pass) { m_LSL_Functions.llPassTouches(pass); } - public void llPlaySound(string sound, double volume) + public void llPlaySound(string sound, LSL_Float volume) { m_LSL_Functions.llPlaySound(sound, volume); } - public void llPlaySoundSlave(string sound, double volume) + public void llPlaySoundSlave(string sound, LSL_Float volume) { m_LSL_Functions.llPlaySoundSlave(sound, volume); } @@ -1154,7 +1154,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llPointAt(pos); } - public LSL_Float llPow(double fbase, double fexponent) + public LSL_Float llPow(LSL_Float fbase, LSL_Float fexponent) { return m_LSL_Functions.llPow(fbase, fexponent); } @@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llPreloadSound(sound); } - public void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, int local) + public void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, LSL_Integer local) { m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local); } @@ -1174,7 +1174,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llRefreshPrimURL(); } - public void llRegionSay(int channelID, string text) + public void llRegionSay(LSL_Integer channelID, string text) { m_LSL_Functions.llRegionSay(channelID, text); } @@ -1194,7 +1194,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llReleaseControls(); } - public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) + public void llRemoteDataReply(string channel, string message_id, string sdata, LSL_Integer idata) { m_LSL_Functions.llRemoteDataReply(channel, message_id, sdata, idata); } @@ -1204,12 +1204,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llRemoteDataSetRegion(); } - public void llRemoteLoadScript(string target, string name, int running, int start_param) + public void llRemoteLoadScript(string target, string name, LSL_Integer running, LSL_Integer start_param) { m_LSL_Functions.llRemoteLoadScript(target, name, running, start_param); } - public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) + public void llRemoteLoadScriptPin(string target, string name, LSL_Integer pin, LSL_Integer running, LSL_Integer start_param) { m_LSL_Functions.llRemoteLoadScriptPin(target, name, pin, running, start_param); } @@ -1229,12 +1229,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llRemoveInventory(item); } - public void llRemoveVehicleFlags(int flags) + public void llRemoveVehicleFlags(LSL_Integer flags) { m_LSL_Functions.llRemoveVehicleFlags(flags); } - public LSL_Key llRequestAgentData(string id, int data) + public LSL_Key llRequestAgentData(string id, LSL_Integer data) { return m_LSL_Functions.llRequestAgentData(id, data); } @@ -1244,7 +1244,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRequestInventoryData(name); } - public void llRequestPermissions(string agent, int perm) + public void llRequestPermissions(string agent, LSL_Integer perm) { m_LSL_Functions.llRequestPermissions(agent, perm); } @@ -1254,7 +1254,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRequestSecureURL(); } - public LSL_Key llRequestSimulatorData(string simulator, int data) + public LSL_Key llRequestSimulatorData(string simulator, LSL_Integer data) { return m_LSL_Functions.llRequestSimulatorData(simulator, data); } @@ -1288,12 +1288,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llResetTime(); } - public void llRezAtRoot(string inventory, LSL_Vector position, LSL_Vector velocity, LSL_Rotation rot, int param) + public void llRezAtRoot(string inventory, LSL_Vector position, LSL_Vector velocity, LSL_Rotation rot, LSL_Integer param) { m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param); } - public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) + public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, LSL_Integer param) { m_LSL_Functions.llRezObject(inventory, pos, vel, rot, param); } @@ -1328,7 +1328,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRot2Up(r); } - public void llRotateTexture(double rotation, int face) + public void llRotateTexture(LSL_Float rotation, LSL_Integer face) { m_LSL_Functions.llRotateTexture(rotation, face); } @@ -1338,22 +1338,22 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRotBetween(start, end); } - public void llRotLookAt(LSL_Rotation target, double strength, double damping) + public void llRotLookAt(LSL_Rotation target, LSL_Float strength, LSL_Float damping) { m_LSL_Functions.llRotLookAt(target, strength, damping); } - public LSL_Integer llRotTarget(LSL_Rotation rot, double error) + public LSL_Integer llRotTarget(LSL_Rotation rot, LSL_Float error) { return m_LSL_Functions.llRotTarget(rot, error); } - public void llRotTargetRemove(int number) + public void llRotTargetRemove(LSL_Integer number) { m_LSL_Functions.llRotTargetRemove(number); } - public LSL_Integer llRound(double f) + public LSL_Integer llRound(LSL_Float f) { return m_LSL_Functions.llRound(f); } @@ -1363,12 +1363,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llSameGroup(agent); } - public void llSay(int channelID, string text) + public void llSay(LSL_Integer channelID, string text) { m_LSL_Functions.llSay(channelID, text); } - public void llScaleTexture(double u, double v, int face) + public void llScaleTexture(LSL_Float u, LSL_Float v, LSL_Integer face) { m_LSL_Functions.llScaleTexture(u, v, face); } @@ -1378,12 +1378,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llScriptDanger(pos); } - public LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata) + public LSL_Key llSendRemoteData(string channel, string dest, LSL_Integer idata, string sdata) { return m_LSL_Functions.llSendRemoteData(channel, dest, idata, sdata); } - public void llSensor(string name, string id, int type, double range, double arc) + public void llSensor(string name, string id, LSL_Integer type, LSL_Float range, LSL_Float arc) { m_LSL_Functions.llSensor(name, id, type, range, arc); } @@ -1393,17 +1393,17 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSensorRemove(); } - public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate) + public void llSensorRepeat(string name, string id, LSL_Integer type, LSL_Float range, LSL_Float arc, LSL_Float rate) { m_LSL_Functions.llSensorRepeat(name, id, type, range, arc, rate); } - public void llSetAlpha(double alpha, int face) + public void llSetAlpha(LSL_Float alpha, LSL_Integer face) { m_LSL_Functions.llSetAlpha(alpha, face); } - public void llSetBuoyancy(double buoyancy) + public void llSetBuoyancy(LSL_Float buoyancy) { m_LSL_Functions.llSetBuoyancy(buoyancy); } @@ -1423,62 +1423,62 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetCameraParams(rules); } - public void llSetClickAction(int action) + public void llSetClickAction(LSL_Integer action) { m_LSL_Functions.llSetClickAction(action); } - public void llSetColor(LSL_Vector color, int face) + public void llSetColor(LSL_Vector color, LSL_Integer face) { m_LSL_Functions.llSetColor(color, face); } - public void llSetDamage(double damage) + public void llSetDamage(LSL_Float damage) { m_LSL_Functions.llSetDamage(damage); } - public void llSetForce(LSL_Vector force, int local) + public void llSetForce(LSL_Vector force, LSL_Integer local) { m_LSL_Functions.llSetForce(force, local); } - public void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local) + public void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, LSL_Integer local) { m_LSL_Functions.llSetForceAndTorque(force, torque, local); } - public void llSetHoverHeight(double height, int water, double tau) + public void llSetHoverHeight(LSL_Float height, LSL_Integer water, LSL_Float tau) { m_LSL_Functions.llSetHoverHeight(height, water, tau); } - public void llSetInventoryPermMask(string item, int mask, int value) + public void llSetInventoryPermMask(string item, LSL_Integer mask, LSL_Integer value) { m_LSL_Functions.llSetInventoryPermMask(item, mask, value); } - public void llSetLinkAlpha(int linknumber, double alpha, int face) + public void llSetLinkAlpha(LSL_Integer linknumber, LSL_Float alpha, LSL_Integer face) { m_LSL_Functions.llSetLinkAlpha(linknumber, alpha, face); } - public void llSetLinkColor(int linknumber, LSL_Vector color, int face) + public void llSetLinkColor(LSL_Integer linknumber, LSL_Vector color, LSL_Integer face) { m_LSL_Functions.llSetLinkColor(linknumber, color, face); } - public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) + public void llSetLinkPrimitiveParams(LSL_Integer linknumber, LSL_List rules) { m_LSL_Functions.llSetLinkPrimitiveParams(linknumber, rules); } - public void llSetLinkTexture(int linknumber, string texture, int face) + public void llSetLinkTexture(LSL_Integer linknumber, string texture, LSL_Integer face) { m_LSL_Functions.llSetLinkTexture(linknumber, texture, face); } - public void llSetLinkTextureAnim(int linknum, int mode, int face, int sizex, int sizey, double start, double length, double rate) + public void llSetLinkTextureAnim(LSL_Integer linknum, LSL_Integer mode, LSL_Integer face, LSL_Integer sizex, LSL_Integer sizey, LSL_Float start, LSL_Float length, LSL_Float rate) { m_LSL_Functions.llSetLinkTextureAnim(linknum, mode, face, sizex, sizey, start, length, rate); } @@ -1498,7 +1498,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetObjectName(name); } - public void llSetObjectPermMask(int mask, int value) + public void llSetObjectPermMask(LSL_Integer mask, LSL_Integer value) { m_LSL_Functions.llSetObjectPermMask(mask, value); } @@ -1508,7 +1508,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetParcelMusicURL(url); } - public void llSetPayPrice(int price, LSL_List quick_pay_buttons) + public void llSetPayPrice(LSL_Integer price, LSL_List quick_pay_buttons) { m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons); } @@ -1523,7 +1523,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetPrimitiveParams(rules); } - public void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules) + public void llSetLinkPrimitiveParamsFast(LSL_Integer linknum, LSL_List rules) { m_LSL_Functions.llSetLinkPrimitiveParamsFast(linknum, rules); } @@ -1533,7 +1533,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetPrimURL(url); } - public void llSetRemoteScriptAccessPin(int pin) + public void llSetRemoteScriptAccessPin(LSL_Integer pin) { m_LSL_Functions.llSetRemoteScriptAccessPin(pin); } @@ -1548,7 +1548,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetScale(scale); } - public void llSetScriptState(string name, int run) + public void llSetScriptState(string name, LSL_Integer run) { m_LSL_Functions.llSetScriptState(name, run); } @@ -1558,42 +1558,42 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetSitText(text); } - public void llSetSoundQueueing(int queue) + public void llSetSoundQueueing(LSL_Integer queue) { m_LSL_Functions.llSetSoundQueueing(queue); } - public void llSetSoundRadius(double radius) + public void llSetSoundRadius(LSL_Float radius) { m_LSL_Functions.llSetSoundRadius(radius); } - public void llSetStatus(int status, int value) + public void llSetStatus(LSL_Integer status, LSL_Integer value) { m_LSL_Functions.llSetStatus(status, value); } - public void llSetText(string text, LSL_Vector color, double alpha) + public void llSetText(string text, LSL_Vector color, LSL_Float alpha) { m_LSL_Functions.llSetText(text, color, alpha); } - public void llSetTexture(string texture, int face) + public void llSetTexture(string texture, LSL_Integer face) { m_LSL_Functions.llSetTexture(texture, face); } - public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) + public void llSetTextureAnim(LSL_Integer mode, LSL_Integer face, LSL_Integer sizex, LSL_Integer sizey, LSL_Float start, LSL_Float length, LSL_Float rate) { m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate); } - public void llSetTimerEvent(double sec) + public void llSetTimerEvent(LSL_Float sec) { m_LSL_Functions.llSetTimerEvent(sec); } - public void llSetTorque(LSL_Vector torque, int local) + public void llSetTorque(LSL_Vector torque, LSL_Integer local) { m_LSL_Functions.llSetTorque(torque, local); } @@ -1603,37 +1603,37 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetTouchText(text); } - public void llSetVehicleFlags(int flags) + public void llSetVehicleFlags(LSL_Integer flags) { m_LSL_Functions.llSetVehicleFlags(flags); } - public void llSetVehicleFloatParam(int param, LSL_Float value) + public void llSetVehicleFloatParam(LSL_Integer param, LSL_Float value) { m_LSL_Functions.llSetVehicleFloatParam(param, value); } - public void llSetVehicleRotationParam(int param, LSL_Rotation rot) + public void llSetVehicleRotationParam(LSL_Integer param, LSL_Rotation rot) { m_LSL_Functions.llSetVehicleRotationParam(param, rot); } - public void llSetVehicleType(int type) + public void llSetVehicleType(LSL_Integer type) { m_LSL_Functions.llSetVehicleType(type); } - public void llSetVehicleVectorParam(int param, LSL_Vector vec) + public void llSetVehicleVectorParam(LSL_Integer param, LSL_Vector vec) { m_LSL_Functions.llSetVehicleVectorParam(param, vec); } - public void llShout(int channelID, string text) + public void llShout(LSL_Integer channelID, string text) { m_LSL_Functions.llShout(channelID, text); } - public LSL_Float llSin(double f) + public LSL_Float llSin(LSL_Float f) { return m_LSL_Functions.llSin(f); } @@ -1643,12 +1643,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSitTarget(offset, rot); } - public void llSleep(double sec) + public void llSleep(LSL_Float sec) { m_LSL_Functions.llSleep(sec); } - public void llSound(string sound, double volume, int queue, int loop) + public void llSound(string sound, LSL_Float volume, LSL_Integer queue, LSL_Integer loop) { m_LSL_Functions.llSound(sound, volume, queue, loop); } @@ -1658,7 +1658,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSoundPreload(sound); } - public LSL_Float llSqrt(double f) + public LSL_Float llSqrt(LSL_Float f) { return m_LSL_Functions.llSqrt(f); } @@ -1708,7 +1708,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llStringToBase64(str); } - public LSL_String llStringTrim(string src, int type) + public LSL_String llStringTrim(string src, LSL_Integer type) { return m_LSL_Functions.llStringTrim(src, type); } @@ -1723,27 +1723,27 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llTakeCamera(avatar); } - public void llTakeControls(int controls, int accept, int pass_on) + public void llTakeControls(LSL_Integer controls, LSL_Integer accept, LSL_Integer pass_on) { m_LSL_Functions.llTakeControls(controls, accept, pass_on); } - public LSL_Float llTan(double f) + public LSL_Float llTan(LSL_Float f) { return m_LSL_Functions.llTan(f); } - public LSL_Integer llTarget(LSL_Vector position, double range) + public LSL_Integer llTarget(LSL_Vector position, LSL_Float range) { return m_LSL_Functions.llTarget(position, range); } - public void llTargetOmega(LSL_Vector axis, double spinrate, double gain) + public void llTargetOmega(LSL_Vector axis, LSL_Float spinrate, LSL_Float gain) { m_LSL_Functions.llTargetOmega(axis, spinrate, gain); } - public void llTargetRemove(int number) + public void llTargetRemove(LSL_Integer number) { m_LSL_Functions.llTargetRemove(number); } @@ -1753,7 +1753,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llTeleportAgentHome(agent); } - public void llTextBox(string avatar, string message, int chat_channel) + public void llTextBox(string avatar, string message, LSL_Integer chat_channel) { m_LSL_Functions.llTextBox(avatar, message, chat_channel); } @@ -1768,12 +1768,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llToUpper(source); } - public void llTriggerSound(string sound, double volume) + public void llTriggerSound(string sound, LSL_Float volume) { m_LSL_Functions.llTriggerSound(sound, volume); } - public void llTriggerSoundLimited(string sound, double volume, LSL_Vector top_north_east, LSL_Vector bottom_south_west) + public void llTriggerSoundLimited(string sound, LSL_Float volume, LSL_Vector top_north_east, LSL_Vector bottom_south_west) { m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west); } @@ -1803,7 +1803,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llVecNorm(v); } - public void llVolumeDetect(int detect) + public void llVolumeDetect(LSL_Integer detect) { m_LSL_Functions.llVolumeDetect(detect); } @@ -1813,7 +1813,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llWater(offset); } - public void llWhisper(int channelID, string text) + public void llWhisper(LSL_Integer channelID, string text) { m_LSL_Functions.llWhisper(channelID, text); } ![]() --- ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs.bak 2010-09-06 19:07:53.821791924 +0200 +++ ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs 2010-09-06 19:14:54.793545596 +0200 @@ -61,17 +61,17 @@ namespace OpenSim.Region.ScriptEngine.Sh Prim = new OSSLPrim(this); } - public void osSetRegionWaterHeight(double height) + public void osSetRegionWaterHeight(LSL_Float height) { m_OSSL_Functions.osSetRegionWaterHeight(height); } - public void osSetRegionSunSettings(bool useEstateSun, bool sunFixed, double sunHour) + public void osSetRegionSunSettings(LSL_Integer useEstateSun, LSL_Integer sunFixed, LSL_Float sunHour) { m_OSSL_Functions.osSetRegionSunSettings(useEstateSun, sunFixed, sunHour); } - public void osSetEstateSunSettings(bool sunFixed, double sunHour) + public void osSetEstateSunSettings(LSL_Integer sunFixed, LSL_Float sunHour) { m_OSSL_Functions.osSetEstateSunSettings(sunFixed, sunHour); } @@ -86,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osSunGetParam(param); } - public void osSunSetParam(string param, double value) + public void osSunSetParam(string param, LSL_Float value) { m_OSSL_Functions.osSunSetParam(param, value); } @@ -116,61 +116,61 @@ namespace OpenSim.Region.ScriptEngine.Sh { m_OSSL_Functions.osParcelSubdivide(pos1, pos2); } - + public void osParcelSetDetails(vector pos, LSL_List rules) { m_OSSL_Functions.osParcelSetDetails(pos,rules); } - public double osList2Double(LSL_Types.list src, int index) + public double osList2Double(LSL_Types.list src, LSL_Integer index) { return m_OSSL_Functions.osList2Double(src, index); } public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, - int timer) + LSL_Integer timer) { return m_OSSL_Functions.osSetDynamicTextureURL(dynamicID, contentType, url, extraParams, timer); } public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, - int timer) + LSL_Integer timer) { return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer); } public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, - int timer, int alpha) + LSL_Integer timer, LSL_Integer alpha) { return m_OSSL_Functions.osSetDynamicTextureURLBlend(dynamicID, contentType, url, extraParams, timer, alpha); } public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, - int timer, int alpha) + LSL_Integer timer, LSL_Integer alpha) { return m_OSSL_Functions.osSetDynamicTextureDataBlend(dynamicID, contentType, data, extraParams, timer, alpha); } public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, - bool blend, int disp, int timer, int alpha, int face) + LSL_Integer blend, LSL_Integer disp, LSL_Integer timer, LSL_Integer alpha, LSL_Integer face) { return m_OSSL_Functions.osSetDynamicTextureURLBlendFace(dynamicID, contentType, url, extraParams, blend, disp, timer, alpha, face); } public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, - bool blend, int disp, int timer, int alpha, int face) + LSL_Integer blend, LSL_Integer disp, LSL_Integer timer, LSL_Integer alpha, LSL_Integer face) { return m_OSSL_Functions.osSetDynamicTextureDataBlendFace(dynamicID, contentType, data, extraParams, blend, disp, timer, alpha, face); } - public LSL_Float osTerrainGetHeight(int x, int y) + public LSL_Float osTerrainGetHeight(LSL_Integer x, LSL_Integer y) { return m_OSSL_Functions.osTerrainGetHeight(x, y); } - public LSL_Integer osTerrainSetHeight(int x, int y, double val) + public LSL_Integer osTerrainSetHeight(LSL_Integer x, LSL_Integer y, LSL_Float val) { return m_OSSL_Functions.osTerrainSetHeight(x, y, val); } @@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osTerrainFlush(); } - public int osRegionRestart(double seconds) + public int osRegionRestart(LSL_Float seconds) { return m_OSSL_Functions.osRegionRestart(seconds); } @@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osSetParcelSIPAddress(SIPAddress); } - public void osSetPrimFloatOnWater(int floatYN) + public void osSetPrimFloatOnWater(LSL_Integer floatYN) { m_OSSL_Functions.osSetPrimFloatOnWater(floatYN); } @@ -217,7 +217,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat); } - public void osTeleportAgent(string agent, int regionX, int regionY, vector position, vector lookat) + public void osTeleportAgent(string agent, LSL_Integer regionX, LSL_Integer regionY, vector position, vector lookat) { m_OSSL_Functions.osTeleportAgent(agent, regionX, regionY, position, lookat); } @@ -253,17 +253,17 @@ namespace OpenSim.Region.ScriptEngine.Sh //Texture Draw functions - public string osMovePen(string drawList, int x, int y) + public string osMovePen(string drawList, LSL_Integer x, LSL_Integer y) { return m_OSSL_Functions.osMovePen(drawList, x, y); } - public string osDrawLine(string drawList, int startX, int startY, int endX, int endY) + public string osDrawLine(string drawList, LSL_Integer startX, LSL_Integer startY, LSL_Integer endX, LSL_Integer endY) { return m_OSSL_Functions.osDrawLine(drawList, startX, startY, endX, endY); } - public string osDrawLine(string drawList, int endX, int endY) + public string osDrawLine(string drawList, LSL_Integer endX, LSL_Integer endY) { return m_OSSL_Functions.osDrawLine(drawList, endX, endY); } @@ -273,17 +273,17 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osDrawText(drawList, text); } - public string osDrawEllipse(string drawList, int width, int height) + public string osDrawEllipse(string drawList, LSL_Integer width, LSL_Integer height) { return m_OSSL_Functions.osDrawEllipse(drawList, width, height); } - public string osDrawRectangle(string drawList, int width, int height) + public string osDrawRectangle(string drawList, LSL_Integer width, LSL_Integer height) { return m_OSSL_Functions.osDrawRectangle(drawList, width, height); } - public string osDrawFilledRectangle(string drawList, int width, int height) + public string osDrawFilledRectangle(string drawList, LSL_Integer width, LSL_Integer height) { return m_OSSL_Functions.osDrawFilledRectangle(drawList, width, height); } @@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y); } - public string osSetFontSize(string drawList, int fontSize) + public string osSetFontSize(string drawList, LSL_Integer fontSize) { return m_OSSL_Functions.osSetFontSize(drawList, fontSize); } @@ -308,7 +308,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osSetFontName(drawList, fontName); } - public string osSetPenSize(string drawList, int penSize) + public string osSetPenSize(string drawList, LSL_Integer penSize) { return m_OSSL_Functions.osSetPenSize(drawList, penSize); } @@ -323,17 +323,17 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osSetPenColour(drawList, colour); } - public string osDrawImage(string drawList, int width, int height, string imageUrl) + public string osDrawImage(string drawList, LSL_Integer width, LSL_Integer height, string imageUrl) { return m_OSSL_Functions.osDrawImage(drawList, width, height, imageUrl); } - public vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize) + public vector osGetDrawStringSize(string contentType, string text, string fontName, LSL_Integer fontSize) { return m_OSSL_Functions.osGetDrawStringSize(contentType, text, fontName, fontSize); } - public void osSetStateEvents(int events) + public void osSetStateEvents(LSL_Integer events) { m_OSSL_Functions.osSetStateEvents(events); } @@ -363,7 +363,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_OSSL_Functions.osMakeNotecard(notecardName, contents); } - public string osGetNotecardLine(string name, int line) + public string osGetNotecardLine(string name, LSL_Integer line) { return m_OSSL_Functions.osGetNotecardLine(name, line); } @@ -408,7 +408,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osFormatString(str, strings); } - public LSL_List osMatchString(string src, string pattern, int start) + public LSL_List osMatchString(string src, string pattern, LSL_Integer start) { return m_OSSL_Functions.osMatchString(src, pattern, start); } @@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_OSSL_Functions.osLoadedCreationID(); } - public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules) + public LSL_List osGetLinkPrimitiveParams(LSL_Integer linknumber, LSL_List rules) { return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules); } @@ -648,7 +648,7 @@ namespace OpenSim.Region.ScriptEngine.Sh { return m_OSSL_Functions.osGetRegionMapTexture(regionName); } - + public LSL_List osGetRegionStats() { return m_OSSL_Functions.osGetRegionStats(); @@ -667,15 +667,15 @@ namespace OpenSim.Region.ScriptEngine.Sh { m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); } - public void osSetSpeed(string UUID, float SpeedModifier) + public void osSetSpeed(string UUID, LSL_Float SpeedModifier) { - m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); + m_OSSL_Functions.osSetSpeed(UUID, (float)((double)SpeedModifier)); } - public void osCauseDamage(string avatar, double damage) + public void osCauseDamage(string avatar, LSL_Float damage) { m_OSSL_Functions.osCauseDamage(avatar, damage); } - public void osCauseHealing(string avatar, double healing) + public void osCauseHealing(string avatar, LSL_Float healing) { m_OSSL_Functions.osCauseHealing(avatar, healing); } --- ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs.bak 2010-09-06 17:18:51.597547133 +0200 +++ ./OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs 2010-09-06 19:03:34.945536377 +0200 @@ -64,32 +64,32 @@ namespace OpenSim.Region.ScriptEngine.Sh // // Script functions // - public LSL_Integer llAbs(int i) + public LSL_Integer llAbs(LSL_Integer i) { return m_LSL_Functions.llAbs(i); } - public LSL_Float llAcos(double val) + public LSL_Float llAcos(LSL_Float val) { return m_LSL_Functions.llAcos(val); } - public void llAddToLandBanList(string avatar, double hours) + public void llAddToLandBanList(string avatar, LSL_Float hours) { m_LSL_Functions.llAddToLandBanList(avatar, hours); } - public void llAddToLandPassList(string avatar, double hours) + public void llAddToLandPassList(string avatar, LSL_Float hours) { m_LSL_Functions.llAddToLandPassList(avatar, hours); } - public void llAdjustSoundVolume(double volume) + public void llAdjustSoundVolume(LSL_Float volume) { m_LSL_Functions.llAdjustSoundVolume(volume); } - public void llAllowInventoryDrop(int add) + public void llAllowInventoryDrop(LSL_Integer add) { m_LSL_Functions.llAllowInventoryDrop(add); } @@ -99,27 +99,27 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llAngleBetween(a, b); } - public void llApplyImpulse(LSL_Vector force, int local) + public void llApplyImpulse(LSL_Vector force, LSL_Integer local) { m_LSL_Functions.llApplyImpulse(force, local); } - public void llApplyRotationalImpulse(LSL_Vector force, int local) + public void llApplyRotationalImpulse(LSL_Vector force, LSL_Integer local) { m_LSL_Functions.llApplyRotationalImpulse(force, local); } - public LSL_Float llAsin(double val) + public LSL_Float llAsin(LSL_Float val) { return m_LSL_Functions.llAsin(val); } - public LSL_Float llAtan2(double x, double y) + public LSL_Float llAtan2(LSL_Float x, LSL_Float y) { return m_LSL_Functions.llAtan2(x, y); } - public void llAttachToAvatar(int attachment) + public void llAttachToAvatar(LSL_Integer attachment) { m_LSL_Functions.llAttachToAvatar(attachment); } @@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llAxes2Rot(fwd, left, up); } - public LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, double angle) + public LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, LSL_Float angle) { return m_LSL_Functions.llAxisAngle2Rot(axis, angle); } @@ -154,12 +154,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llBreakAllLinks(); } - public void llBreakLink(int linknum) + public void llBreakLink(LSL_Integer linknum) { m_LSL_Functions.llBreakLink(linknum); } - public LSL_Integer llCeil(double f) + public LSL_Integer llCeil(LSL_Float f) { return m_LSL_Functions.llCeil(f); } @@ -179,12 +179,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llCloud(offset); } - public void llCollisionFilter(string name, string id, int accept) + public void llCollisionFilter(string name, string id, LSL_Integer accept) { m_LSL_Functions.llCollisionFilter(name, id, accept); } - public void llCollisionSound(string impact_sound, double impact_volume) + public void llCollisionSound(string impact_sound, LSL_Float impact_volume) { m_LSL_Functions.llCollisionSound(impact_sound, impact_volume); } @@ -194,12 +194,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llCollisionSprite(impact_sprite); } - public LSL_Float llCos(double f) + public LSL_Float llCos(LSL_Float f) { return m_LSL_Functions.llCos(f); } - public void llCreateLink(string target, int parent) + public void llCreateLink(string target, LSL_Integer parent) { m_LSL_Functions.llCreateLink(target, parent); } @@ -209,12 +209,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llCSV2List(src); } - public LSL_List llDeleteSubList(LSL_List src, int start, int end) + public LSL_List llDeleteSubList(LSL_List src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llDeleteSubList(src, start, end); } - public LSL_String llDeleteSubString(string src, int start, int end) + public LSL_String llDeleteSubString(string src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llDeleteSubString(src, start, end); } @@ -224,87 +224,87 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llDetachFromAvatar(); } - public LSL_Vector llDetectedGrab(int number) + public LSL_Vector llDetectedGrab(LSL_Integer number) { return m_LSL_Functions.llDetectedGrab(number); } - public LSL_Integer llDetectedGroup(int number) + public LSL_Integer llDetectedGroup(LSL_Integer number) { return m_LSL_Functions.llDetectedGroup(number); } - public LSL_Key llDetectedKey(int number) + public LSL_Key llDetectedKey(LSL_Integer number) { return m_LSL_Functions.llDetectedKey(number); } - public LSL_Integer llDetectedLinkNumber(int number) + public LSL_Integer llDetectedLinkNumber(LSL_Integer number) { return m_LSL_Functions.llDetectedLinkNumber(number); } - public LSL_String llDetectedName(int number) + public LSL_String llDetectedName(LSL_Integer number) { return m_LSL_Functions.llDetectedName(number); } - public LSL_Key llDetectedOwner(int number) + public LSL_Key llDetectedOwner(LSL_Integer number) { return m_LSL_Functions.llDetectedOwner(number); } - public LSL_Vector llDetectedPos(int number) + public LSL_Vector llDetectedPos(LSL_Integer number) { return m_LSL_Functions.llDetectedPos(number); } - public LSL_Rotation llDetectedRot(int number) + public LSL_Rotation llDetectedRot(LSL_Integer number) { return m_LSL_Functions.llDetectedRot(number); } - public LSL_Integer llDetectedType(int number) + public LSL_Integer llDetectedType(LSL_Integer number) { return m_LSL_Functions.llDetectedType(number); } - public LSL_Vector llDetectedTouchBinormal(int index) + public LSL_Vector llDetectedTouchBinormal(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchBinormal(index); } - public LSL_Integer llDetectedTouchFace(int index) + public LSL_Integer llDetectedTouchFace(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchFace(index); } - public LSL_Vector llDetectedTouchNormal(int index) + public LSL_Vector llDetectedTouchNormal(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchNormal(index); } - public LSL_Vector llDetectedTouchPos(int index) + public LSL_Vector llDetectedTouchPos(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchPos(index); } - public LSL_Vector llDetectedTouchST(int index) + public LSL_Vector llDetectedTouchST(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchST(index); } - public LSL_Vector llDetectedTouchUV(int index) + public LSL_Vector llDetectedTouchUV(LSL_Integer index) { return m_LSL_Functions.llDetectedTouchUV(index); } - public LSL_Vector llDetectedVel(int number) + public LSL_Vector llDetectedVel(LSL_Integer number) { return m_LSL_Functions.llDetectedVel(number); } - public void llDialog(string avatar, string message, LSL_List buttons, int chat_channel) + public void llDialog(string avatar, string message, LSL_List buttons, LSL_Integer chat_channel) { m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); } @@ -344,22 +344,22 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llEuler2Rot(v); } - public LSL_Float llFabs(double f) + public LSL_Float llFabs(LSL_Float f) { return m_LSL_Functions.llFabs(f); } - public LSL_Integer llFloor(double f) + public LSL_Integer llFloor(LSL_Float f) { return m_LSL_Functions.llFloor(f); } - public void llForceMouselook(int mouselook) + public void llForceMouselook(LSL_Integer mouselook) { m_LSL_Functions.llForceMouselook(mouselook); } - public LSL_Float llFrand(double mag) + public LSL_Float llFrand(LSL_Float mag) { return m_LSL_Functions.llFrand(mag); } @@ -384,7 +384,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetAgentSize(id); } - public LSL_Float llGetAlpha(int face) + public LSL_Float llGetAlpha(LSL_Integer face) { return m_LSL_Functions.llGetAlpha(face); } @@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetCenterOfMass(); } - public LSL_Vector llGetColor(int face) + public LSL_Vector llGetColor(LSL_Integer face) { return m_LSL_Functions.llGetColor(face); } @@ -489,17 +489,17 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetInventoryKey(name); } - public LSL_String llGetInventoryName(int type, int number) + public LSL_String llGetInventoryName(LSL_Integer type, LSL_Integer number) { return m_LSL_Functions.llGetInventoryName(type, number); } - public LSL_Integer llGetInventoryNumber(int type) + public LSL_Integer llGetInventoryNumber(LSL_Integer type) { return m_LSL_Functions.llGetInventoryNumber(type); } - public LSL_Integer llGetInventoryPermMask(string item, int mask) + public LSL_Integer llGetInventoryPermMask(string item, LSL_Integer mask) { return m_LSL_Functions.llGetInventoryPermMask(item, mask); } @@ -519,12 +519,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetLandOwnerAt(pos); } - public LSL_Key llGetLinkKey(int linknum) + public LSL_Key llGetLinkKey(LSL_Integer linknum) { return m_LSL_Functions.llGetLinkKey(linknum); } - public LSL_String llGetLinkName(int linknum) + public LSL_String llGetLinkName(LSL_Integer linknum) { return m_LSL_Functions.llGetLinkName(linknum); } @@ -534,7 +534,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetLinkNumber(); } - public LSL_Integer llGetListEntryType(LSL_List src, int index) + public LSL_Integer llGetListEntryType(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llGetListEntryType(src, index); } @@ -564,7 +564,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llGetNextEmail(address, subject); } - public LSL_String llGetNotecardLine(string name, int line) + public LSL_String llGetNotecardLine(string name, LSL_Integer line) { return m_LSL_Functions.llGetNotecardLine(name, line); } @@ -604,7 +604,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetObjectName(); } - public LSL_Integer llGetObjectPermMask(int mask) + public LSL_Integer llGetObjectPermMask(LSL_Integer mask) { return m_LSL_Functions.llGetObjectPermMask(mask); } @@ -639,12 +639,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetParcelFlags(pos); } - public LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, int sim_wide) + public LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, LSL_Integer sim_wide) { return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); } - public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) + public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, LSL_Integer category, LSL_Integer sim_wide) { return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); } @@ -674,7 +674,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetPrimitiveParams(rules); } - public LSL_List llGetLinkPrimitiveParams(int linknum, LSL_List rules) + public LSL_List llGetLinkPrimitiveParams(LSL_Integer linknum, LSL_List rules) { return m_LSL_Functions.llGetLinkPrimitiveParams(linknum, rules); } @@ -749,12 +749,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetStartParameter(); } - public LSL_Integer llGetStatus(int status) + public LSL_Integer llGetStatus(LSL_Integer status) { return m_LSL_Functions.llGetStatus(status); } - public LSL_String llGetSubString(string src, int start, int end) + public LSL_String llGetSubString(string src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llGetSubString(src, start, end); } @@ -764,22 +764,22 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGetSunDirection(); } - public LSL_String llGetTexture(int face) + public LSL_String llGetTexture(LSL_Integer face) { return m_LSL_Functions.llGetTexture(face); } - public LSL_Vector llGetTextureOffset(int face) + public LSL_Vector llGetTextureOffset(LSL_Integer face) { return m_LSL_Functions.llGetTextureOffset(face); } - public LSL_Float llGetTextureRot(int side) + public LSL_Float llGetTextureRot(LSL_Integer side) { return m_LSL_Functions.llGetTextureRot(side); } - public LSL_Vector llGetTextureScale(int side) + public LSL_Vector llGetTextureScale(LSL_Integer side) { return m_LSL_Functions.llGetTextureScale(side); } @@ -829,7 +829,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llGiveInventoryList(destination, category, inventory); } - public LSL_Integer llGiveMoney(string destination, int amount) + public LSL_Integer llGiveMoney(string destination, LSL_Integer amount) { return m_LSL_Functions.llGiveMoney(destination, amount); } @@ -854,7 +854,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llGroundNormal(offset); } - public void llGroundRepel(double height, int water, double tau) + public void llGroundRepel(LSL_Float height, LSL_Integer water, LSL_Float tau) { m_LSL_Functions.llGroundRepel(height, water, tau); } @@ -869,12 +869,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llHTTPRequest(url, parameters, body); } - public void llHTTPResponse(LSL_Key id, int status, string body) + public void llHTTPResponse(LSL_Key id, LSL_Integer status, string body) { m_LSL_Functions.llHTTPResponse(id, status, body); } - public LSL_String llInsertString(string dst, int position, string src) + public LSL_String llInsertString(string dst, LSL_Integer position, string src) { return m_LSL_Functions.llInsertString(dst, position, src); } @@ -884,7 +884,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llInstantMessage(user, message); } - public LSL_String llIntegerToBase64(int number) + public LSL_String llIntegerToBase64(LSL_Integer number) { return m_LSL_Functions.llIntegerToBase64(number); } @@ -894,7 +894,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llKey2Name(id); } - public void llLinkParticleSystem(int linknum, LSL_List rules) + public void llLinkParticleSystem(LSL_Integer linknum, LSL_List rules) { m_LSL_Functions.llLinkParticleSystem(linknum, rules); } @@ -904,57 +904,57 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llList2CSV(src); } - public LSL_Float llList2Float(LSL_List src, int index) + public LSL_Float llList2Float(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Float(src, index); } - public LSL_Integer llList2Integer(LSL_List src, int index) + public LSL_Integer llList2Integer(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Integer(src, index); } - public LSL_Key llList2Key(LSL_List src, int index) + public LSL_Key llList2Key(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Key(src, index); } - public LSL_List llList2List(LSL_List src, int start, int end) + public LSL_List llList2List(LSL_List src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llList2List(src, start, end); } - public LSL_List llList2ListStrided(LSL_List src, int start, int end, int stride) + public LSL_List llList2ListStrided(LSL_List src, LSL_Integer start, LSL_Integer end, LSL_Integer stride) { return m_LSL_Functions.llList2ListStrided(src, start, end, stride); } - public LSL_Rotation llList2Rot(LSL_List src, int index) + public LSL_Rotation llList2Rot(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Rot(src, index); } - public LSL_String llList2String(LSL_List src, int index) + public LSL_String llList2String(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2String(src, index); } - public LSL_Vector llList2Vector(LSL_List src, int index) + public LSL_Vector llList2Vector(LSL_List src, LSL_Integer index) { return m_LSL_Functions.llList2Vector(src, index); } - public LSL_Integer llListen(int channelID, string name, string ID, string msg) + public LSL_Integer llListen(LSL_Integer channelID, string name, string ID, string msg) { return m_LSL_Functions.llListen(channelID, name, ID, msg); } - public void llListenControl(int number, int active) + public void llListenControl(LSL_Integer number, LSL_Integer active) { m_LSL_Functions.llListenControl(number, active); } - public void llListenRemove(int number) + public void llListenRemove(LSL_Integer number) { m_LSL_Functions.llListenRemove(number); } @@ -964,27 +964,27 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llListFindList(src, test); } - public LSL_List llListInsertList(LSL_List dest, LSL_List src, int start) + public LSL_List llListInsertList(LSL_List dest, LSL_List src, LSL_Integer start) { return m_LSL_Functions.llListInsertList(dest, src, start); } - public LSL_List llListRandomize(LSL_List src, int stride) + public LSL_List llListRandomize(LSL_List src, LSL_Integer stride) { return m_LSL_Functions.llListRandomize(src, stride); } - public LSL_List llListReplaceList(LSL_List dest, LSL_List src, int start, int end) + public LSL_List llListReplaceList(LSL_List dest, LSL_List src, LSL_Integer start, LSL_Integer end) { return m_LSL_Functions.llListReplaceList(dest, src, start, end); } - public LSL_List llListSort(LSL_List src, int stride, int ascending) + public LSL_List llListSort(LSL_List src, LSL_Integer stride, LSL_Integer ascending) { return m_LSL_Functions.llListSort(src, stride, ascending); } - public LSL_Float llListStatistics(int operation, LSL_List src) + public LSL_Float llListStatistics(LSL_Integer operation, LSL_List src) { return m_LSL_Functions.llListStatistics(operation, src); } @@ -994,52 +994,52 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llLoadURL(avatar_id, message, url); } - public LSL_Float llLog(double val) + public LSL_Float llLog(LSL_Float val) { return m_LSL_Functions.llLog(val); } - public LSL_Float llLog10(double val) + public LSL_Float llLog10(LSL_Float val) { return m_LSL_Functions.llLog10(val); } - public void llLookAt(LSL_Vector target, double strength, double damping) + public void llLookAt(LSL_Vector target, LSL_Float strength, LSL_Float damping) { m_LSL_Functions.llLookAt(target, strength, damping); } - public void llLoopSound(string sound, double volume) + public void llLoopSound(string sound, LSL_Float volume) { m_LSL_Functions.llLoopSound(sound, volume); } - public void llLoopSoundMaster(string sound, double volume) + public void llLoopSoundMaster(string sound, LSL_Float volume) { m_LSL_Functions.llLoopSoundMaster(sound, volume); } - public void llLoopSoundSlave(string sound, double volume) + public void llLoopSoundSlave(string sound, LSL_Float volume) { m_LSL_Functions.llLoopSoundSlave(sound, volume); } - public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) + public void llMakeExplosion(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, string texture, LSL_Vector offset) { m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset); } - public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) + public void llMakeFire(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, string texture, LSL_Vector offset) { m_LSL_Functions.llMakeFire(particles, scale, vel, lifetime, arc, texture, offset); } - public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) + public void llMakeFountain(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, LSL_Integer bounce, string texture, LSL_Vector offset, LSL_Float bounce_offset) { m_LSL_Functions.llMakeFountain(particles, scale, vel, lifetime, arc, bounce, texture, offset, bounce_offset); } - public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) + public void llMakeSmoke(LSL_Integer particles, LSL_Float scale, LSL_Float vel, LSL_Float lifetime, LSL_Float arc, string texture, LSL_Vector offset) { m_LSL_Functions.llMakeSmoke(particles, scale, vel, lifetime, arc, texture, offset); } @@ -1049,7 +1049,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llMapDestination(simname, pos, look_at); } - public LSL_String llMD5String(string src, int nonce) + public LSL_String llMD5String(string src, LSL_Integer nonce) { return m_LSL_Functions.llMD5String(src, nonce); } @@ -1059,32 +1059,32 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llSHA1String(src); } - public void llMessageLinked(int linknum, int num, string str, string id) + public void llMessageLinked(LSL_Integer linknum, LSL_Integer num, string str, string id) { m_LSL_Functions.llMessageLinked(linknum, num, str, id); } - public void llMinEventDelay(double delay) + public void llMinEventDelay(LSL_Float delay) { m_LSL_Functions.llMinEventDelay(delay); } - public void llModifyLand(int action, int brush) + public void llModifyLand(LSL_Integer action, LSL_Integer brush) { m_LSL_Functions.llModifyLand(action, brush); } - public LSL_Integer llModPow(int a, int b, int c) + public LSL_Integer llModPow(LSL_Integer a, LSL_Integer b, LSL_Integer c) { return m_LSL_Functions.llModPow(a, b, c); } - public void llMoveToTarget(LSL_Vector target, double tau) + public void llMoveToTarget(LSL_Vector target, LSL_Float tau) { m_LSL_Functions.llMoveToTarget(target, tau); } - public void llOffsetTexture(double u, double v, int face) + public void llOffsetTexture(LSL_Float u, LSL_Float v, LSL_Integer face) { m_LSL_Functions.llOffsetTexture(u, v, face); } @@ -1129,22 +1129,22 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llParticleSystem(rules); } - public void llPassCollisions(int pass) + public void llPassCollisions(LSL_Integer pass) { m_LSL_Functions.llPassCollisions(pass); } - public void llPassTouches(int pass) + public void llPassTouches(LSL_Integer pass) { m_LSL_Functions.llPassTouches(pass); } - public void llPlaySound(string sound, double volume) + public void llPlaySound(string sound, LSL_Float volume) { m_LSL_Functions.llPlaySound(sound, volume); } - public void llPlaySoundSlave(string sound, double volume) + public void llPlaySoundSlave(string sound, LSL_Float volume) { m_LSL_Functions.llPlaySoundSlave(sound, volume); } @@ -1154,7 +1154,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llPointAt(pos); } - public LSL_Float llPow(double fbase, double fexponent) + public LSL_Float llPow(LSL_Float fbase, LSL_Float fexponent) { return m_LSL_Functions.llPow(fbase, fexponent); } @@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llPreloadSound(sound); } - public void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, int local) + public void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, LSL_Integer local) { m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local); } @@ -1174,7 +1174,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llRefreshPrimURL(); } - public void llRegionSay(int channelID, string text) + public void llRegionSay(LSL_Integer channelID, string text) { m_LSL_Functions.llRegionSay(channelID, text); } @@ -1194,7 +1194,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llReleaseControls(); } - public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) + public void llRemoteDataReply(string channel, string message_id, string sdata, LSL_Integer idata) { m_LSL_Functions.llRemoteDataReply(channel, message_id, sdata, idata); } @@ -1204,12 +1204,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llRemoteDataSetRegion(); } - public void llRemoteLoadScript(string target, string name, int running, int start_param) + public void llRemoteLoadScript(string target, string name, LSL_Integer running, LSL_Integer start_param) { m_LSL_Functions.llRemoteLoadScript(target, name, running, start_param); } - public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) + public void llRemoteLoadScriptPin(string target, string name, LSL_Integer pin, LSL_Integer running, LSL_Integer start_param) { m_LSL_Functions.llRemoteLoadScriptPin(target, name, pin, running, start_param); } @@ -1229,12 +1229,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llRemoveInventory(item); } - public void llRemoveVehicleFlags(int flags) + public void llRemoveVehicleFlags(LSL_Integer flags) { m_LSL_Functions.llRemoveVehicleFlags(flags); } - public LSL_Key llRequestAgentData(string id, int data) + public LSL_Key llRequestAgentData(string id, LSL_Integer data) { return m_LSL_Functions.llRequestAgentData(id, data); } @@ -1244,7 +1244,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRequestInventoryData(name); } - public void llRequestPermissions(string agent, int perm) + public void llRequestPermissions(string agent, LSL_Integer perm) { m_LSL_Functions.llRequestPermissions(agent, perm); } @@ -1254,7 +1254,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRequestSecureURL(); } - public LSL_Key llRequestSimulatorData(string simulator, int data) + public LSL_Key llRequestSimulatorData(string simulator, LSL_Integer data) { return m_LSL_Functions.llRequestSimulatorData(simulator, data); } @@ -1288,12 +1288,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llResetTime(); } - public void llRezAtRoot(string inventory, LSL_Vector position, LSL_Vector velocity, LSL_Rotation rot, int param) + public void llRezAtRoot(string inventory, LSL_Vector position, LSL_Vector velocity, LSL_Rotation rot, LSL_Integer param) { m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param); } - public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) + public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, LSL_Integer param) { m_LSL_Functions.llRezObject(inventory, pos, vel, rot, param); } @@ -1328,7 +1328,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRot2Up(r); } - public void llRotateTexture(double rotation, int face) + public void llRotateTexture(LSL_Float rotation, LSL_Integer face) { m_LSL_Functions.llRotateTexture(rotation, face); } @@ -1338,22 +1338,22 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llRotBetween(start, end); } - public void llRotLookAt(LSL_Rotation target, double strength, double damping) + public void llRotLookAt(LSL_Rotation target, LSL_Float strength, LSL_Float damping) { m_LSL_Functions.llRotLookAt(target, strength, damping); } - public LSL_Integer llRotTarget(LSL_Rotation rot, double error) + public LSL_Integer llRotTarget(LSL_Rotation rot, LSL_Float error) { return m_LSL_Functions.llRotTarget(rot, error); } - public void llRotTargetRemove(int number) + public void llRotTargetRemove(LSL_Integer number) { m_LSL_Functions.llRotTargetRemove(number); } - public LSL_Integer llRound(double f) + public LSL_Integer llRound(LSL_Float f) { return m_LSL_Functions.llRound(f); } @@ -1363,12 +1363,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llSameGroup(agent); } - public void llSay(int channelID, string text) + public void llSay(LSL_Integer channelID, string text) { m_LSL_Functions.llSay(channelID, text); } - public void llScaleTexture(double u, double v, int face) + public void llScaleTexture(LSL_Float u, LSL_Float v, LSL_Integer face) { m_LSL_Functions.llScaleTexture(u, v, face); } @@ -1378,12 +1378,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llScriptDanger(pos); } - public LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata) + public LSL_Key llSendRemoteData(string channel, string dest, LSL_Integer idata, string sdata) { return m_LSL_Functions.llSendRemoteData(channel, dest, idata, sdata); } - public void llSensor(string name, string id, int type, double range, double arc) + public void llSensor(string name, string id, LSL_Integer type, LSL_Float range, LSL_Float arc) { m_LSL_Functions.llSensor(name, id, type, range, arc); } @@ -1393,17 +1393,17 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSensorRemove(); } - public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate) + public void llSensorRepeat(string name, string id, LSL_Integer type, LSL_Float range, LSL_Float arc, LSL_Float rate) { m_LSL_Functions.llSensorRepeat(name, id, type, range, arc, rate); } - public void llSetAlpha(double alpha, int face) + public void llSetAlpha(LSL_Float alpha, LSL_Integer face) { m_LSL_Functions.llSetAlpha(alpha, face); } - public void llSetBuoyancy(double buoyancy) + public void llSetBuoyancy(LSL_Float buoyancy) { m_LSL_Functions.llSetBuoyancy(buoyancy); } @@ -1423,62 +1423,62 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetCameraParams(rules); } - public void llSetClickAction(int action) + public void llSetClickAction(LSL_Integer action) { m_LSL_Functions.llSetClickAction(action); } - public void llSetColor(LSL_Vector color, int face) + public void llSetColor(LSL_Vector color, LSL_Integer face) { m_LSL_Functions.llSetColor(color, face); } - public void llSetDamage(double damage) + public void llSetDamage(LSL_Float damage) { m_LSL_Functions.llSetDamage(damage); } - public void llSetForce(LSL_Vector force, int local) + public void llSetForce(LSL_Vector force, LSL_Integer local) { m_LSL_Functions.llSetForce(force, local); } - public void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local) + public void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, LSL_Integer local) { m_LSL_Functions.llSetForceAndTorque(force, torque, local); } - public void llSetHoverHeight(double height, int water, double tau) + public void llSetHoverHeight(LSL_Float height, LSL_Integer water, LSL_Float tau) { m_LSL_Functions.llSetHoverHeight(height, water, tau); } - public void llSetInventoryPermMask(string item, int mask, int value) + public void llSetInventoryPermMask(string item, LSL_Integer mask, LSL_Integer value) { m_LSL_Functions.llSetInventoryPermMask(item, mask, value); } - public void llSetLinkAlpha(int linknumber, double alpha, int face) + public void llSetLinkAlpha(LSL_Integer linknumber, LSL_Float alpha, LSL_Integer face) { m_LSL_Functions.llSetLinkAlpha(linknumber, alpha, face); } - public void llSetLinkColor(int linknumber, LSL_Vector color, int face) + public void llSetLinkColor(LSL_Integer linknumber, LSL_Vector color, LSL_Integer face) { m_LSL_Functions.llSetLinkColor(linknumber, color, face); } - public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) + public void llSetLinkPrimitiveParams(LSL_Integer linknumber, LSL_List rules) { m_LSL_Functions.llSetLinkPrimitiveParams(linknumber, rules); } - public void llSetLinkTexture(int linknumber, string texture, int face) + public void llSetLinkTexture(LSL_Integer linknumber, string texture, LSL_Integer face) { m_LSL_Functions.llSetLinkTexture(linknumber, texture, face); } - public void llSetLinkTextureAnim(int linknum, int mode, int face, int sizex, int sizey, double start, double length, double rate) + public void llSetLinkTextureAnim(LSL_Integer linknum, LSL_Integer mode, LSL_Integer face, LSL_Integer sizex, LSL_Integer sizey, LSL_Float start, LSL_Float length, LSL_Float rate) { m_LSL_Functions.llSetLinkTextureAnim(linknum, mode, face, sizex, sizey, start, length, rate); } @@ -1498,7 +1498,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetObjectName(name); } - public void llSetObjectPermMask(int mask, int value) + public void llSetObjectPermMask(LSL_Integer mask, LSL_Integer value) { m_LSL_Functions.llSetObjectPermMask(mask, value); } @@ -1508,7 +1508,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetParcelMusicURL(url); } - public void llSetPayPrice(int price, LSL_List quick_pay_buttons) + public void llSetPayPrice(LSL_Integer price, LSL_List quick_pay_buttons) { m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons); } @@ -1523,7 +1523,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetPrimitiveParams(rules); } - public void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules) + public void llSetLinkPrimitiveParamsFast(LSL_Integer linknum, LSL_List rules) { m_LSL_Functions.llSetLinkPrimitiveParamsFast(linknum, rules); } @@ -1533,7 +1533,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetPrimURL(url); } - public void llSetRemoteScriptAccessPin(int pin) + public void llSetRemoteScriptAccessPin(LSL_Integer pin) { m_LSL_Functions.llSetRemoteScriptAccessPin(pin); } @@ -1548,7 +1548,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetScale(scale); } - public void llSetScriptState(string name, int run) + public void llSetScriptState(string name, LSL_Integer run) { m_LSL_Functions.llSetScriptState(name, run); } @@ -1558,42 +1558,42 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetSitText(text); } - public void llSetSoundQueueing(int queue) + public void llSetSoundQueueing(LSL_Integer queue) { m_LSL_Functions.llSetSoundQueueing(queue); } - public void llSetSoundRadius(double radius) + public void llSetSoundRadius(LSL_Float radius) { m_LSL_Functions.llSetSoundRadius(radius); } - public void llSetStatus(int status, int value) + public void llSetStatus(LSL_Integer status, LSL_Integer value) { m_LSL_Functions.llSetStatus(status, value); } - public void llSetText(string text, LSL_Vector color, double alpha) + public void llSetText(string text, LSL_Vector color, LSL_Float alpha) { m_LSL_Functions.llSetText(text, color, alpha); } - public void llSetTexture(string texture, int face) + public void llSetTexture(string texture, LSL_Integer face) { m_LSL_Functions.llSetTexture(texture, face); } - public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) + public void llSetTextureAnim(LSL_Integer mode, LSL_Integer face, LSL_Integer sizex, LSL_Integer sizey, LSL_Float start, LSL_Float length, LSL_Float rate) { m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate); } - public void llSetTimerEvent(double sec) + public void llSetTimerEvent(LSL_Float sec) { m_LSL_Functions.llSetTimerEvent(sec); } - public void llSetTorque(LSL_Vector torque, int local) + public void llSetTorque(LSL_Vector torque, LSL_Integer local) { m_LSL_Functions.llSetTorque(torque, local); } @@ -1603,37 +1603,37 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSetTouchText(text); } - public void llSetVehicleFlags(int flags) + public void llSetVehicleFlags(LSL_Integer flags) { m_LSL_Functions.llSetVehicleFlags(flags); } - public void llSetVehicleFloatParam(int param, LSL_Float value) + public void llSetVehicleFloatParam(LSL_Integer param, LSL_Float value) { m_LSL_Functions.llSetVehicleFloatParam(param, value); } - public void llSetVehicleRotationParam(int param, LSL_Rotation rot) + public void llSetVehicleRotationParam(LSL_Integer param, LSL_Rotation rot) { m_LSL_Functions.llSetVehicleRotationParam(param, rot); } - public void llSetVehicleType(int type) + public void llSetVehicleType(LSL_Integer type) { m_LSL_Functions.llSetVehicleType(type); } - public void llSetVehicleVectorParam(int param, LSL_Vector vec) + public void llSetVehicleVectorParam(LSL_Integer param, LSL_Vector vec) { m_LSL_Functions.llSetVehicleVectorParam(param, vec); } - public void llShout(int channelID, string text) + public void llShout(LSL_Integer channelID, string text) { m_LSL_Functions.llShout(channelID, text); } - public LSL_Float llSin(double f) + public LSL_Float llSin(LSL_Float f) { return m_LSL_Functions.llSin(f); } @@ -1643,12 +1643,12 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSitTarget(offset, rot); } - public void llSleep(double sec) + public void llSleep(LSL_Float sec) { m_LSL_Functions.llSleep(sec); } - public void llSound(string sound, double volume, int queue, int loop) + public void llSound(string sound, LSL_Float volume, LSL_Integer queue, LSL_Integer loop) { m_LSL_Functions.llSound(sound, volume, queue, loop); } @@ -1658,7 +1658,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llSoundPreload(sound); } - public LSL_Float llSqrt(double f) + public LSL_Float llSqrt(LSL_Float f) { return m_LSL_Functions.llSqrt(f); } @@ -1708,7 +1708,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llStringToBase64(str); } - public LSL_String llStringTrim(string src, int type) + public LSL_String llStringTrim(string src, LSL_Integer type) { return m_LSL_Functions.llStringTrim(src, type); } @@ -1723,27 +1723,27 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llTakeCamera(avatar); } - public void llTakeControls(int controls, int accept, int pass_on) + public void llTakeControls(LSL_Integer controls, LSL_Integer accept, LSL_Integer pass_on) { m_LSL_Functions.llTakeControls(controls, accept, pass_on); } - public LSL_Float llTan(double f) + public LSL_Float llTan(LSL_Float f) { return m_LSL_Functions.llTan(f); } - public LSL_Integer llTarget(LSL_Vector position, double range) + public LSL_Integer llTarget(LSL_Vector position, LSL_Float range) { return m_LSL_Functions.llTarget(position, range); } - public void llTargetOmega(LSL_Vector axis, double spinrate, double gain) + public void llTargetOmega(LSL_Vector axis, LSL_Float spinrate, LSL_Float gain) { m_LSL_Functions.llTargetOmega(axis, spinrate, gain); } - public void llTargetRemove(int number) + public void llTargetRemove(LSL_Integer number) { m_LSL_Functions.llTargetRemove(number); } @@ -1753,7 +1753,7 @@ namespace OpenSim.Region.ScriptEngine.Sh m_LSL_Functions.llTeleportAgentHome(agent); } - public void llTextBox(string avatar, string message, int chat_channel) + public void llTextBox(string avatar, string message, LSL_Integer chat_channel) { m_LSL_Functions.llTextBox(avatar, message, chat_channel); } @@ -1768,12 +1768,12 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llToUpper(source); } - public void llTriggerSound(string sound, double volume) + public void llTriggerSound(string sound, LSL_Float volume) { m_LSL_Functions.llTriggerSound(sound, volume); } - public void llTriggerSoundLimited(string sound, double volume, LSL_Vector top_north_east, LSL_Vector bottom_south_west) + public void llTriggerSoundLimited(string sound, LSL_Float volume, LSL_Vector top_north_east, LSL_Vector bottom_south_west) { m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west); } @@ -1803,7 +1803,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llVecNorm(v); } - public void llVolumeDetect(int detect) + public void llVolumeDetect(LSL_Integer detect) { m_LSL_Functions.llVolumeDetect(detect); } @@ -1813,7 +1813,7 @@ namespace OpenSim.Region.ScriptEngine.Sh return m_LSL_Functions.llWater(offset); } - public void llWhisper(int channelID, string text) + public void llWhisper(LSL_Integer channelID, string text) { m_LSL_Functions.llWhisper(channelID, text); } --- ./OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs.bak 2010-09-10 23:01:10.000000000 +0200 +++ ./OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs 2010-09-21 15:56:40.033419129 +0200 @@ -104,7 +104,8 @@ namespace OpenSim.Region.ScriptEngine.Sh return new Vector3(s); } - public static implicit operator list(Vector3 vec) + // vectors aren't supposed to implicitly cast to lists + public static explicit operator list(Vector3 vec) { return new list(new object[] { vec }); } @@ -363,7 +364,8 @@ namespace OpenSim.Region.ScriptEngine.Sh return new Quaternion(s); } - public static implicit operator list(Quaternion r) + // quaternions aren't supposed to implicitly cast to list + public static explicit operator list(Quaternion r) { return new list(new object[] { r }); } @@ -587,11 +589,24 @@ namespace OpenSim.Region.ScriptEngine.Sh return new list(tmp); } - private void ExtendAndAdd(object o) + private void ExtendAndAdd (object o) { - Array.Resize(ref m_data, Length + 1); - m_data.SetValue(o, Length - 1); + Array.Resize (ref m_data, Length + 1); + m_data.SetValue (o, Length - 1); } + + // by overloading the + operator, you overload the += one too + public static list operator +(list a, Vector3 v) + { + a.ExtendAndAdd(v); + return a; + } + + public static list operator +(list a, Quaternion q) + { + a.ExtendAndAdd(q); + return a; + } public static list operator +(list a, LSLString s) { @@ -1498,7 +1513,8 @@ namespace OpenSim.Region.ScriptEngine.Sh return new LSLFloat(s); } - public static implicit operator list(LSLString s) + // strings aren't supposed to implicitly cast to lists + public static explicit operator list(LSLString s) { return new list(new object[]{s}); } @@ -1602,7 +1618,8 @@ namespace OpenSim.Region.ScriptEngine.Sh return new LSLString(i.ToString()); } - public static implicit operator list(LSLInteger i) + // integers aren't supposed to implicitly cast to lists + public static explicit operator list(LSLInteger i) { return new list(new object[] { i }); } @@ -1910,7 +1927,8 @@ namespace OpenSim.Region.ScriptEngine.Sh return new LSLFloat(s); } - public static implicit operator list(LSLFloat f) + // reals aren't supposed to implicitly cast to lists + public static explicit operator list(LSLFloat f) { return new list(new object[] { f }); } | |||||||||
![]() |
|
(0016817) player (reporter) 2010-09-11 05:38 |
My bad, I had posted it into the wrong category |
(0016877) player (reporter) 2010-09-24 06:07 |
New fix. The older patch made functions accept any kind of data types in place of lists. That's fixed in the newer patch. Changes: 1. vectors, quaternions, strings, integers and floats shouldn't be able to implicitly cast to list. 2. The only two cases in which we want to do that is when we have + and +=. Both cases can be managed by overloading the + operator. I added an overload in case of "list + vector" and "list + quaternion". |
(0018795) makopoppo (manager) 2011-07-09 00:59 |
I tested your sample with current OpenSimulator without applying your patch. llAbs works well, llCeil fails. If you change llCeil call like that: ----- integer ceil = llCeil((float)("huh" == "DUH!")); // float expected ----- It works well. It is because there is no casting rule from raw bool to raw double. However, there are type casting rule between bool to LSLFloat, and LSLFloat to double, so the sample above works well. Changing LSL api arguments to double -> LSLFloat might be the solution for this problem, but I afraid there would be side-effects if someone have already used them in C# code. I think it needs testing in C# interface and voting in opensim-user mailing list. |
![]() |
|||
Date Modified | Username | Field | Change |
2010-09-06 11:29 | player | New Issue | |
2010-09-06 11:29 | player | File Added: type_fix.diff | |
2010-09-06 11:29 | player | Git Revision | => 0 |
2010-09-06 11:29 | player | SVN Revision | => 0 |
2010-09-06 11:29 | player | Run Mode | => Standalone (1 Region) |
2010-09-06 11:29 | player | Physics Engine | => BasicPhysics |
2010-09-06 11:29 | player | Environment | => Mono / Linux64 |
2010-09-06 11:29 | player | Mono Version | => Other |
2010-09-11 05:37 | player | Category | [MISC] Compiling / Building => [REGION] Scripting Engine |
2010-09-11 05:38 | player | Note Added: 0016817 | |
2010-09-24 06:07 | player | Note Added: 0016877 | |
2010-09-24 06:07 | player | File Added: type_fix-2.diff | |
2011-07-09 00:59 | makopoppo | Note Added: 0018795 | |
2011-07-09 00:59 | makopoppo | Status | new => patch feedback |
2011-10-21 19:16 | justincc | Status | patch feedback => patch included |
Copyright © 2000 - 2012 MantisBT Group |