diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-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 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 | ||