diff options
author | Robert Adams | 2013-12-01 15:51:42 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-01 15:51:42 -0800 |
commit | 31bacfbb63a3871af1ff1fbaec2acd5f5021c926 (patch) | |
tree | fe9b9d826c1fdef55840d346ff5c9c481a4bfc82 /OpenSim/Region/ClientStack | |
parent | varregion: Add MaxRegionSize constant and enforce in RegionInfo. (diff) | |
parent | Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced fo... (diff) | |
download | opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.zip opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.gz opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.bz2 opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 4671ed0..8a6270d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -2607,11 +2607,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2607 | { | 2607 | { |
2608 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); | 2608 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); |
2609 | avatarSitResponse.SitObject.ID = TargetID; | 2609 | avatarSitResponse.SitObject.ID = TargetID; |
2610 | if (CameraAtOffset != Vector3.Zero) | 2610 | avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset; |
2611 | { | 2611 | avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset; |
2612 | avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset; | ||
2613 | avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset; | ||
2614 | } | ||
2615 | avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook; | 2612 | avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook; |
2616 | avatarSitResponse.SitTransform.AutoPilot = autopilot; | 2613 | avatarSitResponse.SitTransform.AutoPilot = autopilot; |
2617 | avatarSitResponse.SitTransform.SitPosition = OffsetPos; | 2614 | avatarSitResponse.SitTransform.SitPosition = OffsetPos; |
@@ -5051,6 +5048,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5051 | { | 5048 | { |
5052 | ScenePresence presence = (ScenePresence)entity; | 5049 | ScenePresence presence = (ScenePresence)entity; |
5053 | 5050 | ||
5051 | // m_log.DebugFormat( | ||
5052 | // "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name); | ||
5053 | |||
5054 | attachPoint = presence.State; | 5054 | attachPoint = presence.State; |
5055 | collisionPlane = presence.CollisionPlane; | 5055 | collisionPlane = presence.CollisionPlane; |
5056 | position = presence.OffsetPosition; | 5056 | position = presence.OffsetPosition; |
@@ -5170,6 +5170,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5170 | 5170 | ||
5171 | protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) | 5171 | protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data) |
5172 | { | 5172 | { |
5173 | // m_log.DebugFormat( | ||
5174 | // "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name); | ||
5175 | |||
5173 | byte[] objectData = new byte[76]; | 5176 | byte[] objectData = new byte[76]; |
5174 | 5177 | ||
5175 | data.CollisionPlane.ToBytes(objectData, 0); | 5178 | data.CollisionPlane.ToBytes(objectData, 0); |
@@ -5190,7 +5193,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5190 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + | 5193 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + |
5191 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); | 5194 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); |
5192 | update.ObjectData = objectData; | 5195 | update.ObjectData = objectData; |
5193 | update.ParentID = data.ParentID; | 5196 | |
5197 | SceneObjectPart parentPart = data.ParentPart; | ||
5198 | if (parentPart != null) | ||
5199 | update.ParentID = parentPart.ParentGroup.LocalId; | ||
5200 | else | ||
5201 | update.ParentID = 0; | ||
5202 | |||
5194 | update.PathCurve = 16; | 5203 | update.PathCurve = 16; |
5195 | update.PathScaleX = 100; | 5204 | update.PathScaleX = 100; |
5196 | update.PathScaleY = 100; | 5205 | update.PathScaleY = 100; |
@@ -12615,6 +12624,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12615 | { | 12624 | { |
12616 | if (p is ScenePresence) | 12625 | if (p is ScenePresence) |
12617 | { | 12626 | { |
12627 | // m_log.DebugFormat( | ||
12628 | // "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}", | ||
12629 | // p.Name, Name, Scene.Name); | ||
12630 | |||
12618 | // It turns out to get the agent to stop flying, you have to feed it stop flying velocities | 12631 | // It turns out to get the agent to stop flying, you have to feed it stop flying velocities |
12619 | // There's no explicit message to send the client to tell it to stop flying.. it relies on the | 12632 | // There's no explicit message to send the client to tell it to stop flying.. it relies on the |
12620 | // velocity, collision plane and avatar height | 12633 | // velocity, collision plane and avatar height |