diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index aaa5e1c..86ec7e2 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2239,6 +2239,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2239 | awb.AssetID = wearables[i].AssetID; | 2239 | awb.AssetID = wearables[i].AssetID; |
2240 | awb.ItemID = wearables[i].ItemID; | 2240 | awb.ItemID = wearables[i].ItemID; |
2241 | aw.WearableData[i] = awb; | 2241 | aw.WearableData[i] = awb; |
2242 | |||
2243 | // m_log.DebugFormat( | ||
2244 | // "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}", | ||
2245 | // awb.ItemID, awb.AssetID, i, Name); | ||
2242 | } | 2246 | } |
2243 | 2247 | ||
2244 | OutPacket(aw, ThrottleOutPacketType.Task); | 2248 | OutPacket(aw, ThrottleOutPacketType.Task); |
@@ -4205,6 +4209,8 @@ Console.WriteLine(msgpack.ToString()); | |||
4205 | 4209 | ||
4206 | if (handlerRequestWearables != null) | 4210 | if (handlerRequestWearables != null) |
4207 | { | 4211 | { |
4212 | m_log.DebugFormat("[APPEARANCE]: Wearables requested by {0}", Name); | ||
4213 | |||
4208 | handlerRequestWearables(); | 4214 | handlerRequestWearables(); |
4209 | } | 4215 | } |
4210 | 4216 | ||
@@ -7076,7 +7082,6 @@ Console.WriteLine(msgpack.ToString()); | |||
7076 | 7082 | ||
7077 | public void SendAsset(AssetRequestToClient req) | 7083 | public void SendAsset(AssetRequestToClient req) |
7078 | { | 7084 | { |
7079 | |||
7080 | //Console.WriteLine("sending asset " + req.RequestAssetID); | 7085 | //Console.WriteLine("sending asset " + req.RequestAssetID); |
7081 | TransferInfoPacket Transfer = new TransferInfoPacket(); | 7086 | TransferInfoPacket Transfer = new TransferInfoPacket(); |
7082 | Transfer.TransferInfo.ChannelType = 2; | 7087 | Transfer.TransferInfo.ChannelType = 2; |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 7bc0360..5a28f2f 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1851,7 +1851,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1851 | m_log.DebugFormat("[APPEARANCE]: Sending wearables to {0}", Name); | 1851 | m_log.DebugFormat("[APPEARANCE]: Sending wearables to {0}", Name); |
1852 | 1852 | ||
1853 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 1853 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
1854 | // ControllingClient.SendAppearance( | 1854 | //ControllingClient.SendAppearance( |
1855 | // m_appearance.Owner, | 1855 | // m_appearance.Owner, |
1856 | // m_appearance.VisualParams, | 1856 | // m_appearance.VisualParams, |
1857 | // m_appearance.Texture.ToBytes() | 1857 | // m_appearance.Texture.ToBytes() |
@@ -1896,7 +1896,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1896 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); | 1896 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); |
1897 | 1897 | ||
1898 | SendAppearanceToAllOtherAgents(); | 1898 | SendAppearanceToAllOtherAgents(); |
1899 | SendWearables(); | 1899 | //SendWearables(); |
1900 | } | 1900 | } |
1901 | 1901 | ||
1902 | public void SetWearable(int wearableId, AvatarWearable wearable) | 1902 | public void SetWearable(int wearableId, AvatarWearable wearable) |