aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorSean Dague2008-05-07 18:40:18 +0000
committerSean Dague2008-05-07 18:40:18 +0000
commit5ff3c03c122b9a1df4080aeaad5ece1574d2aea3 (patch)
treed92c8b2b98d31f95eada910b561e8a0da9accc43 /OpenSim/Region/Environment
parent* Theoretically, everything is in place for scripted take controls... Theo... (diff)
downloadopensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.zip
opensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.gz
opensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.bz2
opensim-SC_OLD-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.xz
get all the right bits to SendPrimitiveToClient so we can actually
set vel, acc, and rvel in the packet (though this isn't done yet).
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 56821c6..adcd646 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2331,10 +2331,8 @@ namespace OpenSim.Region.Environment.Scenes
2331 /// <param name="clientFlags"></param> 2331 /// <param name="clientFlags"></param>
2332 public void SendFullUpdateToClient(IClientAPI remoteClient, LLVector3 lPos, uint clientFlags) 2332 public void SendFullUpdateToClient(IClientAPI remoteClient, LLVector3 lPos, uint clientFlags)
2333 { 2333 {
2334 LLQuaternion lRot;
2335 lRot = RotationOffset;
2336 clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected; 2334 clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected;
2337 2335
2338 if (remoteClient.AgentId == OwnerID) 2336 if (remoteClient.AgentId == OwnerID)
2339 { 2337 {
2340 if ((uint) (Flags & LLObject.ObjectFlags.CreateSelected) != 0) 2338 if ((uint) (Flags & LLObject.ObjectFlags.CreateSelected) != 0)
@@ -2346,9 +2344,11 @@ namespace OpenSim.Region.Environment.Scenes
2346 2344
2347 2345
2348 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; 2346 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
2349 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid, 2347 remoteClient.SendPrimitiveToClient(
2348 m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
2349 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid,
2350 OwnerID, 2350 OwnerID,
2351 m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID); 2351 m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID);
2352 } 2352 }
2353 2353
2354 /// Terse updates 2354 /// Terse updates