aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs12
2 files changed, 11 insertions, 9 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
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 84ccafe..4855d64 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -218,14 +218,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
218 } 218 }
219 } 219 }
220 220
221 Vector3 absPos = part.AbsolutePosition; 221 Position = new LSL_Types.Vector3(part.AbsolutePosition.X,
222 Position = new LSL_Types.Vector3(absPos.X, absPos.Y, absPos.Z); 222 part.AbsolutePosition.Y,
223 part.AbsolutePosition.Z);
223 224
224 Quaternion wr = part.ParentGroup.Rotation; 225 Quaternion wr = part.ParentGroup.GroupRotation;
225 Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); 226 Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W);
226 227
227 Vector3 vel = part.Velocity; 228 Velocity = new LSL_Types.Vector3(part.Velocity.X,
228 Velocity = new LSL_Types.Vector3(vel.X, vel.Y, vel.Z); 229 part.Velocity.Y,
230 part.Velocity.Z);
229 } 231 }
230 } 232 }
231 233