OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

0.1-prestable
MW 2007-04-10 10:45:46 +00:00
parent 34d91c31cf
commit 03f5ff9dc2
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim.RegionServer/world/AvatarUpdate.cs
View File

@ -109,7 +109,10 @@ namespace OpenSim.world
client.OutPacket(objupdate); client.OutPacket(objupdate);
if (client.AgentID != ControllingClient.AgentID) if (client.AgentID != ControllingClient.AgentID)
{ {
client.ClientAvatar.SendAppearanceToOtherAgent(this.ControllingClient); //the below line is already in Simclient.cs at line number 245 , directly below the call to this method
//if there is a problem/bug with that , then lets fix it there rather than duplicating it here
//client.ClientAvatar.SendAppearanceToOtherAgent(this.ControllingClient);
SendAppearanceToOtherAgent(client); SendAppearanceToOtherAgent(client);
} }
} }
@ -142,10 +145,12 @@ namespace OpenSim.world
avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes(); avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes();
AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); //a wearable update packets should only be sent about the viewers/agents own avatar not for other avatars
//but it seems that the following code only created the packets and never actually sent them anyway
/*AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
aw.AgentData.AgentID = this.ControllingClient.AgentID; aw.AgentData.AgentID = this.ControllingClient.AgentID;
aw.AgentData.SessionID = userInfo.SessionID; aw.AgentData.SessionID = userInfo.SessionID;
aw.AgentData.SerialNum = (uint)(new Random()).Next(); 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
aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
AgentWearablesUpdatePacket.WearableDataBlock awb; AgentWearablesUpdatePacket.WearableDataBlock awb;
@ -156,7 +161,7 @@ namespace OpenSim.world
awb.AssetID = this.Wearables[i].AssetID; awb.AssetID = this.Wearables[i].AssetID;
awb.ItemID = this.Wearables[i].ItemID; awb.ItemID = this.Wearables[i].ItemID;
aw.WearableData[i] = awb; aw.WearableData[i] = awb;
} }*/
AvatarAppearancePacket.VisualParamBlock avblock = null; AvatarAppearancePacket.VisualParamBlock avblock = null;
for (int i = 0; i < 218; i++) for (int i = 0; i < 218; i++)