fixed chatting while sitting
parent
98fd8f099b
commit
33ac0653a3
|
@ -546,11 +546,12 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
if (m_parentID != 0)
|
if (m_parentID != 0)
|
||||||
{
|
{
|
||||||
SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
|
SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
|
||||||
LLVector3 pos = new LLVector3();
|
|
||||||
if (part != null)
|
if (part != null)
|
||||||
pos = part.AbsolutePosition + m_requestedSitOffset +
|
AbsolutePosition = part.AbsolutePosition + m_requestedSitOffset +
|
||||||
new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
|
new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
|
||||||
MakeRootAgent(pos, false);
|
|
||||||
|
AddToPhysicalScene();
|
||||||
|
|
||||||
m_parentID = 0;
|
m_parentID = 0;
|
||||||
SendFullUpdateToAllClients();
|
SendFullUpdateToAllClients();
|
||||||
}
|
}
|
||||||
|
@ -623,7 +624,10 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
AbsolutePosition = m_requestedSitOffset +
|
AbsolutePosition = m_requestedSitOffset +
|
||||||
new LLVector3(m_physicsActor.Size.X/2.7f, 0f, m_physicsActor.Size.Z/1.45f);
|
new LLVector3(m_physicsActor.Size.X/2.7f, 0f, m_physicsActor.Size.Z/1.45f);
|
||||||
m_parentID = m_requestedSitTargetID;
|
m_parentID = m_requestedSitTargetID;
|
||||||
MakeChildAgent();
|
|
||||||
|
Velocity = new LLVector3(0, 0, 0);
|
||||||
|
RemoveFromPhysicalScene();
|
||||||
|
|
||||||
SendAnimPack(Animations.AnimsLLUUID["SIT"], 1);
|
SendAnimPack(Animations.AnimsLLUUID["SIT"], 1);
|
||||||
SendFullUpdateToAllClients();
|
SendFullUpdateToAllClients();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue