aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorMelanie2009-10-02 00:47:01 +0100
committerMelanie2009-10-02 00:47:01 +0100
commit212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e (patch)
tree5af4731fb69cb8546a9cfb857dabbebc5f0b6ee1 /OpenSim/Region/ScriptEngine/Shared/Api
parentFix a merge conflict (diff)
downloadopensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.zip
opensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.gz
opensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.bz2
opensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.xz
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
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 3051609..11ae661 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2013,10 +2013,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2013 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate 2013 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
2014 } 2014 }
2015 else 2015 else
2016 q = part.ParentGroup.Rotation; // Likely never get here but just in case 2016 q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
2017 } 2017 }
2018 else 2018 else
2019 q = part.ParentGroup.Rotation; // just the group rotation 2019 q = part.ParentGroup.GroupRotation; // just the group rotation
2020 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 2020 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2021 } 2021 }
2022 q = part.GetWorldRotation(); 2022 q = part.GetWorldRotation();
@@ -7184,10 +7184,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7184 else 7184 else
7185 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate 7185 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
7186 else 7186 else
7187 q = m_host.ParentGroup.Rotation; // Likely never get here but just in case 7187 q = m_host.ParentGroup.GroupRotation; // Likely never get here but just in case
7188 } 7188 }
7189 else 7189 else
7190 q = m_host.ParentGroup.Rotation; // just the group rotation 7190 q = m_host.ParentGroup.GroupRotation; // just the group rotation
7191 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 7191 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
7192 } 7192 }
7193 7193