diff options
Diffstat (limited to 'OpenSim.RegionServer/world/AvatarUpdate.cs')
-rw-r--r-- | OpenSim.RegionServer/world/AvatarUpdate.cs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim.RegionServer/world/AvatarUpdate.cs b/OpenSim.RegionServer/world/AvatarUpdate.cs index cfb138a..d315de7 100644 --- a/OpenSim.RegionServer/world/AvatarUpdate.cs +++ b/OpenSim.RegionServer/world/AvatarUpdate.cs | |||
@@ -109,8 +109,11 @@ namespace OpenSim.world | |||
109 | client.OutPacket(objupdate); | 109 | client.OutPacket(objupdate); |
110 | if (client.AgentID != ControllingClient.AgentID) | 110 | if (client.AgentID != ControllingClient.AgentID) |
111 | { | 111 | { |
112 | client.ClientAvatar.SendAppearanceToOtherAgent(this.ControllingClient); | 112 | //the below line is already in Simclient.cs at line number 245 , directly below the call to this method |
113 | SendAppearanceToOtherAgent(client); | 113 | //if there is a problem/bug with that , then lets fix it there rather than duplicating it here |
114 | //client.ClientAvatar.SendAppearanceToOtherAgent(this.ControllingClient); | ||
115 | |||
116 | SendAppearanceToOtherAgent(client); | ||
114 | } | 117 | } |
115 | } | 118 | } |
116 | } | 119 | } |
@@ -142,10 +145,12 @@ namespace OpenSim.world | |||
142 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; | 145 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; |
143 | avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes(); | 146 | avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes(); |
144 | 147 | ||
145 | AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); | 148 | //a wearable update packets should only be sent about the viewers/agents own avatar not for other avatars |
149 | //but it seems that the following code only created the packets and never actually sent them anyway | ||
150 | /*AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); | ||
146 | aw.AgentData.AgentID = this.ControllingClient.AgentID; | 151 | aw.AgentData.AgentID = this.ControllingClient.AgentID; |
147 | aw.AgentData.SessionID = userInfo.SessionID; | 152 | aw.AgentData.SessionID = userInfo.SessionID; |
148 | aw.AgentData.SerialNum = (uint)(new Random()).Next(); | 153 | aw.AgentData.SerialNum = 0; //removed the use of a random number as a random number could be less than the last number, should have a counter variable for this |
149 | 154 | ||
150 | aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; | 155 | aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; |
151 | AgentWearablesUpdatePacket.WearableDataBlock awb; | 156 | AgentWearablesUpdatePacket.WearableDataBlock awb; |
@@ -156,8 +161,8 @@ namespace OpenSim.world | |||
156 | awb.AssetID = this.Wearables[i].AssetID; | 161 | awb.AssetID = this.Wearables[i].AssetID; |
157 | awb.ItemID = this.Wearables[i].ItemID; | 162 | awb.ItemID = this.Wearables[i].ItemID; |
158 | aw.WearableData[i] = awb; | 163 | aw.WearableData[i] = awb; |
159 | } | 164 | }*/ |
160 | 165 | ||
161 | AvatarAppearancePacket.VisualParamBlock avblock = null; | 166 | AvatarAppearancePacket.VisualParamBlock avblock = null; |
162 | for (int i = 0; i < 218; i++) | 167 | for (int i = 0; i < 218; i++) |
163 | { | 168 | { |