diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0bd6546..bf83a49 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2007,10 +2007,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2007 | q = avatar.Rotation; // Currently infrequently updated so may be inaccurate | 2007 | q = avatar.Rotation; // Currently infrequently updated so may be inaccurate |
2008 | } | 2008 | } |
2009 | else | 2009 | else |
2010 | q = part.ParentGroup.GroupRotation; // Likely never get here but just in case | 2010 | q = part.ParentGroup.Rotation; // Likely never get here but just in case |
2011 | } | 2011 | } |
2012 | else | 2012 | else |
2013 | q = part.ParentGroup.GroupRotation; // just the group rotation | 2013 | q = part.ParentGroup.Rotation; // just the group rotation |
2014 | return new LSL_Rotation(q.X, q.Y, q.Z, q.W); | 2014 | return new LSL_Rotation(q.X, q.Y, q.Z, q.W); |
2015 | } | 2015 | } |
2016 | q = part.GetWorldRotation(); | 2016 | q = part.GetWorldRotation(); |
@@ -7181,10 +7181,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7181 | else | 7181 | else |
7182 | q = avatar.Rotation; // Currently infrequently updated so may be inaccurate | 7182 | q = avatar.Rotation; // Currently infrequently updated so may be inaccurate |
7183 | else | 7183 | else |
7184 | q = m_host.ParentGroup.GroupRotation; // Likely never get here but just in case | 7184 | q = m_host.ParentGroup.Rotation; // Likely never get here but just in case |
7185 | } | 7185 | } |
7186 | else | 7186 | else |
7187 | q = m_host.ParentGroup.GroupRotation; // just the group rotation | 7187 | q = m_host.ParentGroup.Rotation; // just the group rotation |
7188 | return new LSL_Rotation(q.X, q.Y, q.Z, q.W); | 7188 | return new LSL_Rotation(q.X, q.Y, q.Z, q.W); |
7189 | } | 7189 | } |
7190 | 7190 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index d0df390..8dcb1f5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
95 | return m_OSSL_Functions.osWindActiveModelPluginName(); | 95 | return m_OSSL_Functions.osWindActiveModelPluginName(); |
96 | } | 96 | } |
97 | 97 | ||
98 | // Not yet plugged in as available OSSL functions, so commented out | 98 | // Not yet plugged in as available OSSL functions, so commented out |
99 | // void osWindParamSet(string plugin, string param, float value) | 99 | // void osWindParamSet(string plugin, string param, float value) |
100 | // { | 100 | // { |
101 | // m_OSSL_Functions.osWindParamSet(plugin, param, value); | 101 | // m_OSSL_Functions.osWindParamSet(plugin, param, value); |
@@ -329,7 +329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
329 | 329 | ||
330 | public string osGetSimulatorVersion() | 330 | public string osGetSimulatorVersion() |
331 | { | 331 | { |
332 | return m_OSSL_Functions.osGetSimulatorVersion(); | 332 | return m_OSSL_Functions.osGetSimulatorVersion(); |
333 | } | 333 | } |
334 | 334 | ||
335 | public Hashtable osParseJSON(string JSON) | 335 | public Hashtable osParseJSON(string JSON) |