diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 9c86c74..b37fd54 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -441,6 +441,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
441 | public LLClientView(EndPoint remoteEP, Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo, | 441 | public LLClientView(EndPoint remoteEP, Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo, |
442 | UUID agentId, UUID sessionId, uint circuitCode) | 442 | UUID agentId, UUID sessionId, uint circuitCode) |
443 | { | 443 | { |
444 | // DebugPacketLevel = 1; | ||
445 | |||
444 | RegisterInterface<IClientIM>(this); | 446 | RegisterInterface<IClientIM>(this); |
445 | RegisterInterface<IClientChat>(this); | 447 | RegisterInterface<IClientChat>(this); |
446 | RegisterInterface<IClientIPEndpoint>(this); | 448 | RegisterInterface<IClientIPEndpoint>(this); |
@@ -4893,8 +4895,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4893 | update.Scale = new Vector3(0.45f, 0.6f, 1.9f); | 4895 | update.Scale = new Vector3(0.45f, 0.6f, 1.9f); |
4894 | update.Text = Utils.EmptyBytes; | 4896 | update.Text = Utils.EmptyBytes; |
4895 | update.TextColor = new byte[4]; | 4897 | update.TextColor = new byte[4]; |
4898 | |||
4899 | // Don't send texture anim for avatars - this has no meaning for them. | ||
4896 | update.TextureAnim = Utils.EmptyBytes; | 4900 | update.TextureAnim = Utils.EmptyBytes; |
4897 | update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; | 4901 | |
4902 | // Don't send texture entry for avatars here - this is accomplished via the AvatarAppearance packet | ||
4903 | update.TextureEntry = Utils.EmptyBytes; | ||
4904 | // update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; | ||
4905 | |||
4898 | update.UpdateFlags = (uint)( | 4906 | update.UpdateFlags = (uint)( |
4899 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | | 4907 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | |
4900 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | | 4908 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | |
@@ -6001,7 +6009,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6001 | // for the client session anyway, in order to protect ourselves against bad code in plugins | 6009 | // for the client session anyway, in order to protect ourselves against bad code in plugins |
6002 | try | 6010 | try |
6003 | { | 6011 | { |
6004 | |||
6005 | byte[] visualparams = new byte[appear.VisualParam.Length]; | 6012 | byte[] visualparams = new byte[appear.VisualParam.Length]; |
6006 | for (int i = 0; i < appear.VisualParam.Length; i++) | 6013 | for (int i = 0; i < appear.VisualParam.Length; i++) |
6007 | visualparams[i] = appear.VisualParam[i].ParamValue; | 6014 | visualparams[i] = appear.VisualParam[i].ParamValue; |
@@ -10345,6 +10352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10345 | } | 10352 | } |
10346 | return true; | 10353 | return true; |
10347 | } | 10354 | } |
10355 | |||
10348 | private bool HandleGroupRoleMembersRequest(IClientAPI sender, Packet Pack) | 10356 | private bool HandleGroupRoleMembersRequest(IClientAPI sender, Packet Pack) |
10349 | { | 10357 | { |
10350 | GroupRoleMembersRequestPacket groupRoleMembersRequest = | 10358 | GroupRoleMembersRequestPacket groupRoleMembersRequest = |
@@ -11218,9 +11226,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11218 | /// <summary> | 11226 | /// <summary> |
11219 | /// Send a response back to a client when it asks the asset server (via the region server) if it has | 11227 | /// Send a response back to a client when it asks the asset server (via the region server) if it has |
11220 | /// its appearance texture cached. | 11228 | /// its appearance texture cached. |
11221 | /// | ||
11222 | /// At the moment, we always reply that there is no cached texture. | ||
11223 | /// </summary> | 11229 | /// </summary> |
11230 | /// <remarks> | ||
11231 | /// At the moment, we always reply that there is no cached texture. | ||
11232 | /// </remarks> | ||
11224 | /// <param name="simclient"></param> | 11233 | /// <param name="simclient"></param> |
11225 | /// <param name="packet"></param> | 11234 | /// <param name="packet"></param> |
11226 | /// <returns></returns> | 11235 | /// <returns></returns> |
@@ -11230,7 +11239,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11230 | AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; | 11239 | AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; |
11231 | AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); | 11240 | AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); |
11232 | 11241 | ||
11233 | if (cachedtex.AgentData.SessionID != SessionId) return false; | 11242 | if (cachedtex.AgentData.SessionID != SessionId) |
11243 | return false; | ||
11234 | 11244 | ||
11235 | // TODO: don't create new blocks if recycling an old packet | 11245 | // TODO: don't create new blocks if recycling an old packet |
11236 | cachedresp.AgentData.AgentID = AgentId; | 11246 | cachedresp.AgentData.AgentID = AgentId; |
@@ -11628,6 +11638,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11628 | if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate) | 11638 | if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate) |
11629 | logPacket = false; | 11639 | logPacket = false; |
11630 | 11640 | ||
11641 | if (DebugPacketLevel <= 25 && packet.Type == PacketType.ObjectPropertiesFamily) | ||
11642 | logPacket = false; | ||
11643 | |||
11631 | if (logPacket) | 11644 | if (logPacket) |
11632 | m_log.DebugFormat( | 11645 | m_log.DebugFormat( |
11633 | "[CLIENT]: PACKET OUT to {0} ({1}) in {2} - {3}", | 11646 | "[CLIENT]: PACKET OUT to {0} ({1}) in {2} - {3}", |
@@ -11685,6 +11698,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11685 | if (DebugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation)) | 11698 | if (DebugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation)) |
11686 | logPacket = false; | 11699 | logPacket = false; |
11687 | 11700 | ||
11701 | if (DebugPacketLevel <= 25 && packet.Type == PacketType.RequestObjectPropertiesFamily) | ||
11702 | logPacket = false; | ||
11703 | |||
11688 | if (logPacket) | 11704 | if (logPacket) |
11689 | m_log.DebugFormat( | 11705 | m_log.DebugFormat( |
11690 | "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}", | 11706 | "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}", |