aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2012-09-03 21:53:46 +0100
committerMelanie2012-09-03 21:53:46 +0100
commit574a6e35807d522a211f05d2370da2a31277051a (patch)
tree844f2fee7dfe2be0df1b6951be1ef2ebce603f8d /OpenSim/Region/ScriptEngine
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-574a6e35807d522a211f05d2370da2a31277051a.zip
opensim-SC-574a6e35807d522a211f05d2370da2a31277051a.tar.gz
opensim-SC-574a6e35807d522a211f05d2370da2a31277051a.tar.bz2
opensim-SC-574a6e35807d522a211f05d2370da2a31277051a.tar.xz
Revert "formatting"
This reverts commit fb211c64fd9d335f4879549023870b1e28416f74.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index dda8257..89bd6ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2314,7 +2314,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2314 public void llSetRot(LSL_Rotation rot) 2314 public void llSetRot(LSL_Rotation rot)
2315 { 2315 {
2316 m_host.AddScriptLPS(1); 2316 m_host.AddScriptLPS(1);
2317 SetRot(m_host, rot); 2317 SetRot(m_host, rot);
2318 ScriptSleep(200); 2318 ScriptSleep(200);
2319 } 2319 }
2320 2320
@@ -7850,7 +7850,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7850 if (remain < 1) 7850 if (remain < 1)
7851 return null; 7851 return null;
7852 7852
7853 SetRot(part, rules.GetQuaternionItem(idx++)); 7853 SetRot(part, rules.GetQuaternionItem(idx++));
7854 7854
7855 break; 7855 break;
7856 7856