aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-20 19:25:37 -0400
committerTeravus Ovares (Dan Olivares)2009-08-20 19:25:37 -0400
commitb8d7663f545f0856b62e751694f0e46702d83007 (patch)
treebf57c5a65369b7dcb614fdc5a6c692ee2b75979a /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parent* Switch border cross tests over to the new Border class. (diff)
downloadopensim-SC-b8d7663f545f0856b62e751694f0e46702d83007.zip
opensim-SC-b8d7663f545f0856b62e751694f0e46702d83007.tar.gz
opensim-SC-b8d7663f545f0856b62e751694f0e46702d83007.tar.bz2
opensim-SC-b8d7663f545f0856b62e751694f0e46702d83007.tar.xz
* Deal with git thinking that file was changed even though it wasn't and it's blocking a pull
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs48
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4e665e9..972e71c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1978,30 +1978,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1978 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 1978 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
1979 } 1979 }
1980 1980
1981 private LSL_Rotation GetPartRot( SceneObjectPart part ) 1981 private LSL_Rotation GetPartRot( SceneObjectPart part )
1982 { 1982 {
1983 Quaternion q; 1983 Quaternion q;
1984 if (part.LinkNum == 0 || part.LinkNum == 1) // unlinked or root prim 1984 if (part.LinkNum == 0 || part.LinkNum == 1) // unlinked or root prim
1985 { 1985 {
1986 if (part.ParentGroup.RootPart.AttachmentPoint != 0) 1986 if (part.ParentGroup.RootPart.AttachmentPoint != 0)
1987 { 1987 {
1988 ScenePresence avatar = World.GetScenePresence(part.AttachedAvatar); 1988 ScenePresence avatar = World.GetScenePresence(part.AttachedAvatar);
1989 if (avatar != null) 1989 if (avatar != null)
1990 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) 1990 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
1991 q = avatar.CameraRotation; // Mouselook 1991 q = avatar.CameraRotation; // Mouselook
1992 else 1992 else
1993 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate 1993 q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
1994 else 1994 else
1995 q = part.ParentGroup.GroupRotation; // Likely never get here but just in case 1995 q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
1996 } 1996 }
1997 else 1997 else
1998 q = part.ParentGroup.GroupRotation; // just the group rotation 1998 q = part.ParentGroup.GroupRotation; // just the group rotation
1999 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 1999 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2000 } 2000 }
2001 q = part.GetWorldRotation(); 2001 q = part.GetWorldRotation();
2002 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 2002 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2003 } 2003 }
2004 2004
2005 public LSL_Rotation llGetLocalRot() 2005 public LSL_Rotation llGetLocalRot()
2006 { 2006 {
2007 m_host.AddScriptLPS(1); 2007 m_host.AddScriptLPS(1);