aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-29 02:41:32 +0000
committerJustin Clark-Casey (justincc)2013-11-29 02:41:32 +0000
commitca079c378a442f58da1df155916480591a7fb082 (patch)
tree7f90295c2e8ba65824c522b84e93f60a9ae2e2c2 /OpenSim/Region/ClientStack
parentAdd parameter checking for land_collision, land_collision_start and land_coll... (diff)
parentFix regression where sitting on ground stopped working. (diff)
downloadopensim-SC_OLD-ca079c378a442f58da1df155916480591a7fb082.zip
opensim-SC_OLD-ca079c378a442f58da1df155916480591a7fb082.tar.gz
opensim-SC_OLD-ca079c378a442f58da1df155916480591a7fb082.tar.bz2
opensim-SC_OLD-ca079c378a442f58da1df155916480591a7fb082.tar.xz
Merge branch 'link-sitting'
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs18
1 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 20bc59c..8592650 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5079,6 +5079,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5079 { 5079 {
5080 ScenePresence presence = (ScenePresence)entity; 5080 ScenePresence presence = (ScenePresence)entity;
5081 5081
5082// m_log.DebugFormat(
5083// "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name);
5084
5082 attachPoint = presence.State; 5085 attachPoint = presence.State;
5083 collisionPlane = presence.CollisionPlane; 5086 collisionPlane = presence.CollisionPlane;
5084 position = presence.OffsetPosition; 5087 position = presence.OffsetPosition;
@@ -5198,6 +5201,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5198 5201
5199 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) 5202 protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
5200 { 5203 {
5204// m_log.DebugFormat(
5205// "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name);
5206
5201 byte[] objectData = new byte[76]; 5207 byte[] objectData = new byte[76];
5202 5208
5203 data.CollisionPlane.ToBytes(objectData, 0); 5209 data.CollisionPlane.ToBytes(objectData, 0);
@@ -5218,7 +5224,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5218 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + 5224 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
5219 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); 5225 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
5220 update.ObjectData = objectData; 5226 update.ObjectData = objectData;
5221 update.ParentID = data.ParentID; 5227
5228 SceneObjectPart parentPart = data.ParentPart;
5229 if (parentPart != null)
5230 update.ParentID = parentPart.ParentGroup.LocalId;
5231 else
5232 update.ParentID = 0;
5233
5222 update.PathCurve = 16; 5234 update.PathCurve = 16;
5223 update.PathScaleX = 100; 5235 update.PathScaleX = 100;
5224 update.PathScaleY = 100; 5236 update.PathScaleY = 100;
@@ -12643,6 +12655,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12643 { 12655 {
12644 if (p is ScenePresence) 12656 if (p is ScenePresence)
12645 { 12657 {
12658// m_log.DebugFormat(
12659// "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}",
12660// p.Name, Name, Scene.Name);
12661
12646 // It turns out to get the agent to stop flying, you have to feed it stop flying velocities 12662 // It turns out to get the agent to stop flying, you have to feed it stop flying velocities
12647 // There's no explicit message to send the client to tell it to stop flying.. it relies on the 12663 // There's no explicit message to send the client to tell it to stop flying.. it relies on the
12648 // velocity, collision plane and avatar height 12664 // velocity, collision plane and avatar height