OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused and broken OffsetRotation from ScenePresence

avinationmerge
Melanie 2011-11-05 20:39:43 +00:00
parent 506653ff00
commit cc8e693fb9
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -199,7 +199,6 @@ namespace OpenSim.Region.Framework.Scenes
//PauPaw:Proper PID Controler for autopilot************ //PauPaw:Proper PID Controler for autopilot************
public bool MovingToTarget { get; private set; } public bool MovingToTarget { get; private set; }
public Vector3 MoveToPositionTarget { get; private set; } public Vector3 MoveToPositionTarget { get; private set; }
private Quaternion m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
/// <summary> /// <summary>
/// Controls whether an avatar automatically moving to a target will land when it gets there (if flying). /// Controls whether an avatar automatically moving to a target will land when it gets there (if flying).
@ -612,39 +611,15 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
public Quaternion OffsetRotation
{
get { return m_offsetRotation; }
set { m_offsetRotation = value; }
}
private Quaternion m_bodyRot = Quaternion.Identity; private Quaternion m_bodyRot = Quaternion.Identity;
public Quaternion Rotation public Quaternion Rotation
{ {
get { get { return m_bodyRot; }
if (m_parentID != 0) set
{ {
if (m_offsetRotation != null)
{
return m_offsetRotation;
}
else
{
return new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
}
}
else
{
return m_bodyRot;
}
}
set {
m_bodyRot = value; m_bodyRot = value;
if (m_parentID != 0) // m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot);
{
m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
}
} }
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -7564,7 +7564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
LSL_Rotation r; LSL_Rotation r;
r = rules.GetQuaternionItem(idx++); r = rules.GetQuaternionItem(idx++);
av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
av.SendAvatarDataToAllAgents(); av.SendAvatarDataToAllAgents();
break; break;
} }