diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 30 |
2 files changed, 23 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 762e22a..613bc24 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -743,6 +743,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
743 | inType = (sbyte)InventoryType.Sound; | 743 | inType = (sbyte)InventoryType.Sound; |
744 | assType = (sbyte)AssetType.Sound; | 744 | assType = (sbyte)AssetType.Sound; |
745 | } | 745 | } |
746 | else if (inventoryType == "snapshot") | ||
747 | { | ||
748 | inType = (sbyte)InventoryType.Snapshot; | ||
749 | } | ||
746 | else if (inventoryType == "animation") | 750 | else if (inventoryType == "animation") |
747 | { | 751 | { |
748 | inType = (sbyte)InventoryType.Animation; | 752 | inType = (sbyte)InventoryType.Animation; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 21a173d..f8e2a60 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -2648,11 +2648,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2648 | { | 2648 | { |
2649 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); | 2649 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); |
2650 | avatarSitResponse.SitObject.ID = TargetID; | 2650 | avatarSitResponse.SitObject.ID = TargetID; |
2651 | if (CameraAtOffset != Vector3.Zero) | 2651 | avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset; |
2652 | { | 2652 | avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset; |
2653 | avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset; | ||
2654 | avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset; | ||
2655 | } | ||
2656 | avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook; | 2653 | avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook; |
2657 | avatarSitResponse.SitTransform.AutoPilot = autopilot; | 2654 | avatarSitResponse.SitTransform.AutoPilot = autopilot; |
2658 | avatarSitResponse.SitTransform.SitPosition = OffsetPos; | 2655 | avatarSitResponse.SitTransform.SitPosition = OffsetPos; |
@@ -5150,15 +5147,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5150 | } | 5147 | } |
5151 | 5148 | ||
5152 | attachPoint = 0; | 5149 | attachPoint = 0; |
5150 | // m_log.DebugFormat( | ||
5151 | // "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name); | ||
5152 | |||
5153 | // attachPoint = presence.State; // Core: commented | ||
5153 | collisionPlane = presence.CollisionPlane; | 5154 | collisionPlane = presence.CollisionPlane; |
5154 | velocity = presence.Velocity; | 5155 | velocity = presence.Velocity; |
5155 | acceleration = Vector3.Zero; | 5156 | acceleration = Vector3.Zero; |
5156 | 5157 | ||
5157 | // Interestingly, sending this to non-zero will cause the client's avatar to start moving & accelerating | ||
5158 | // in that direction, even though we don't model this on the server. Implementing this in the future | ||
5159 | // may improve movement smoothness. | ||
5160 | // acceleration = new Vector3(1, 0, 0); | ||
5161 | |||
5162 | if (sendTexture) | 5158 | if (sendTexture) |
5163 | textureEntry = presence.Appearance.Texture.GetBytes(); | 5159 | textureEntry = presence.Appearance.Texture.GetBytes(); |
5164 | else | 5160 | else |
@@ -5278,6 +5274,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5278 | parentID = part.ParentGroup.RootPart.LocalId; | 5274 | parentID = part.ParentGroup.RootPart.LocalId; |
5279 | } | 5275 | } |
5280 | } | 5276 | } |
5277 | // m_log.DebugFormat( | ||
5278 | // "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name); | ||
5281 | 5279 | ||
5282 | byte[] objectData = new byte[76]; | 5280 | byte[] objectData = new byte[76]; |
5283 | 5281 | ||
@@ -5303,7 +5301,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5303 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + | 5301 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + |
5304 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); | 5302 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); |
5305 | update.ObjectData = objectData; | 5303 | update.ObjectData = objectData; |
5306 | update.ParentID = parentID; | 5304 | |
5305 | SceneObjectPart parentPart = data.ParentPart; | ||
5306 | if (parentPart != null) | ||
5307 | update.ParentID = parentPart.ParentGroup.LocalId; | ||
5308 | else | ||
5309 | update.ParentID = 0; | ||
5310 | |||
5307 | update.PathCurve = 16; | 5311 | update.PathCurve = 16; |
5308 | update.PathScaleX = 100; | 5312 | update.PathScaleX = 100; |
5309 | update.PathScaleY = 100; | 5313 | update.PathScaleY = 100; |
@@ -13007,6 +13011,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
13007 | { | 13011 | { |
13008 | if (p is ScenePresence) | 13012 | if (p is ScenePresence) |
13009 | { | 13013 | { |
13014 | // m_log.DebugFormat( | ||
13015 | // "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}", | ||
13016 | // p.Name, Name, Scene.Name); | ||
13017 | |||
13010 | // It turns out to get the agent to stop flying, you have to feed it stop flying velocities | 13018 | // It turns out to get the agent to stop flying, you have to feed it stop flying velocities |
13011 | // There's no explicit message to send the client to tell it to stop flying.. it relies on the | 13019 | // There's no explicit message to send the client to tell it to stop flying.. it relies on the |
13012 | // velocity, collision plane and avatar height | 13020 | // velocity, collision plane and avatar height |