diff options
author | Adam Frisby | 2009-10-02 10:54:01 +1000 |
---|---|---|
committer | Adam Frisby | 2009-10-02 10:54:01 +1000 |
commit | a2cdbd784db2630d83546fcd9a41d2c8e2103408 (patch) | |
tree | 419af5c711a59add7ce64aa1c16b9d6001500f05 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | * Attempting to fix a issue with console commands & the estate module. Again. (diff) | |
parent | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-a2cdbd784db2630d83546fcd9a41d2c8e2103408.zip opensim-SC-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.gz opensim-SC-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.bz2 opensim-SC-a2cdbd784db2630d83546fcd9a41d2c8e2103408.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index bf83a49..0bd6546 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.Rotation; // Likely never get here but just in case | 2010 | q = part.ParentGroup.GroupRotation; // Likely never get here but just in case |
2011 | } | 2011 | } |
2012 | else | 2012 | else |
2013 | q = part.ParentGroup.Rotation; // just the group rotation | 2013 | q = part.ParentGroup.GroupRotation; // 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.Rotation; // Likely never get here but just in case | 7184 | q = m_host.ParentGroup.GroupRotation; // Likely never get here but just in case |
7185 | } | 7185 | } |
7186 | else | 7186 | else |
7187 | q = m_host.ParentGroup.Rotation; // just the group rotation | 7187 | q = m_host.ParentGroup.GroupRotation; // 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 | ||