diff options
author | Jeff Ames | 2008-08-28 14:41:54 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-28 14:41:54 +0000 |
commit | 3bf88587277b83c0b6f058fabba7d46a3b5a6a00 (patch) | |
tree | ed4ad9dc27e649a6f52661665fb681984251f480 /OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |
parent | Thannk you, Ralphos, for a patch the corrects an improper cast in (diff) | |
download | opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.zip opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.gz opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.bz2 opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 9fdf3ce..f10a854 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -2296,7 +2296,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2296 | bool found = false; | 2296 | bool found = false; |
2297 | 2297 | ||
2298 | float dist = (float)llVecDist(llGetPos(), pos); | 2298 | float dist = (float)llVecDist(llGetPos(), pos); |
2299 | if(dist > m_distanceFactor * 10.0f) | 2299 | if (dist > m_distanceFactor * 10.0f) |
2300 | return; | 2300 | return; |
2301 | 2301 | ||
2302 | // Instead of using return;, I'm using continue; because in our TaskInventory implementation | 2302 | // Instead of using return;, I'm using continue; because in our TaskInventory implementation |
@@ -6247,7 +6247,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
6247 | switch (primType) | 6247 | switch (primType) |
6248 | { | 6248 | { |
6249 | case BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: | 6249 | case BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: |
6250 | case BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER: | 6250 | case BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER: |
6251 | case BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM: | 6251 | case BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM: |
6252 | res.Add(new LSL_Types.LSLInteger(Shape.ProfileCurve)); | 6252 | res.Add(new LSL_Types.LSLInteger(Shape.ProfileCurve)); |
6253 | res.Add(new LSL_Types.Vector3(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0)); | 6253 | res.Add(new LSL_Types.Vector3(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0)); |
@@ -6298,10 +6298,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
6298 | // vector tapera | 6298 | // vector tapera |
6299 | res.Add(new LSL_Types.Vector3(Shape.PathTaperX / 100.0, Shape.PathTaperY / 100.0, 0)); | 6299 | res.Add(new LSL_Types.Vector3(Shape.PathTaperX / 100.0, Shape.PathTaperY / 100.0, 0)); |
6300 | 6300 | ||
6301 | // float revolutions, | 6301 | // float revolutions, |
6302 | res.Add(new LSL_Types.LSLFloat(Shape.PathRevolutions / 50.0)); // needs fixing :( | 6302 | res.Add(new LSL_Types.LSLFloat(Shape.PathRevolutions / 50.0)); // needs fixing :( |
6303 | 6303 | ||
6304 | // float radiusoffset, | 6304 | // float radiusoffset, |
6305 | res.Add(new LSL_Types.LSLFloat(Shape.PathRadiusOffset / 100.0)); | 6305 | res.Add(new LSL_Types.LSLFloat(Shape.PathRadiusOffset / 100.0)); |
6306 | 6306 | ||
6307 | // float skew | 6307 | // float skew |
@@ -7014,10 +7014,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
7014 | { | 7014 | { |
7015 | case 5: // DATA_SIM_POS | 7015 | case 5: // DATA_SIM_POS |
7016 | if (info == null) | 7016 | if (info == null) |
7017 | { | 7017 | { |
7018 | // ScriptSleep(1000); | 7018 | // ScriptSleep(1000); |
7019 | return LLUUID.Zero.ToString(); | 7019 | return LLUUID.Zero.ToString(); |
7020 | } | 7020 | } |
7021 | reply = new LSL_Types.Vector3( | 7021 | reply = new LSL_Types.Vector3( |
7022 | info.RegionLocX * Constants.RegionSize, | 7022 | info.RegionLocX * Constants.RegionSize, |
7023 | info.RegionLocY * Constants.RegionSize, | 7023 | info.RegionLocY * Constants.RegionSize, |
@@ -7031,10 +7031,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
7031 | break; | 7031 | break; |
7032 | case 7: // DATA_SIM_RATING | 7032 | case 7: // DATA_SIM_RATING |
7033 | if (info == null) | 7033 | if (info == null) |
7034 | { | 7034 | { |
7035 | // ScriptSleep(1000); | 7035 | // ScriptSleep(1000); |
7036 | return LLUUID.Zero.ToString(); | 7036 | return LLUUID.Zero.ToString(); |
7037 | } | 7037 | } |
7038 | int access = info.RegionSettings.Maturity; | 7038 | int access = info.RegionSettings.Maturity; |
7039 | if (access == 0) | 7039 | if (access == 0) |
7040 | reply = "PG"; | 7040 | reply = "PG"; |
@@ -7047,18 +7047,18 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
7047 | reply = m_ScriptEngine.World.GetSimulatorVersion(); | 7047 | reply = m_ScriptEngine.World.GetSimulatorVersion(); |
7048 | break; | 7048 | break; |
7049 | default: | 7049 | default: |
7050 | // ScriptSleep(1000); | 7050 | // ScriptSleep(1000); |
7051 | return LLUUID.Zero.ToString(); // Raise no event | 7051 | return LLUUID.Zero.ToString(); // Raise no event |
7052 | } | 7052 | } |
7053 | LLUUID rq = LLUUID.Random(); | 7053 | LLUUID rq = LLUUID.Random(); |
7054 | 7054 | ||
7055 | LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager. | 7055 | LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager. |
7056 | m_Dataserver.RegisterRequest(m_localID, m_itemID, rq.ToString()); | 7056 | m_Dataserver.RegisterRequest(m_localID, m_itemID, rq.ToString()); |
7057 | 7057 | ||
7058 | m_ScriptEngine.m_ASYNCLSLCommandManager. | 7058 | m_ScriptEngine.m_ASYNCLSLCommandManager. |
7059 | m_Dataserver.DataserverReply(rq.ToString(), reply); | 7059 | m_Dataserver.DataserverReply(rq.ToString(), reply); |
7060 | 7060 | ||
7061 | // ScriptSleep(1000); | 7061 | // ScriptSleep(1000); |
7062 | return tid.ToString(); | 7062 | return tid.ToString(); |
7063 | } | 7063 | } |
7064 | catch(Exception e) | 7064 | catch(Exception e) |
@@ -8041,12 +8041,12 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
8041 | (line >= 0) && | 8041 | (line >= 0) && |
8042 | (line < notecardLines.Length)) | 8042 | (line < notecardLines.Length)) |
8043 | { | 8043 | { |
8044 | // ScriptSleep(100); | 8044 | // ScriptSleep(100); |
8045 | return notecardLines[line]; | 8045 | return notecardLines[line]; |
8046 | } | 8046 | } |
8047 | else | 8047 | else |
8048 | { | 8048 | { |
8049 | // ScriptSleep(100); | 8049 | // ScriptSleep(100); |
8050 | return String.Empty; | 8050 | return String.Empty; |
8051 | } | 8051 | } |
8052 | } | 8052 | } |