From 03f5ff9dc21767d1757c9b9ccd3c7ef40b49880f Mon Sep 17 00:00:00 2001 From: MW Date: Tue, 10 Apr 2007 10:45:46 +0000 Subject: --- OpenSim.RegionServer/SimClient.cs | 36 +++++++++++++++--------------- OpenSim.RegionServer/world/AvatarUpdate.cs | 19 ++++++++++------ 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 40076d1..6d174c8 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs @@ -85,7 +85,7 @@ namespace OpenSim protected static Dictionary PacketHandlers = new Dictionary(); //Global/static handlers for all clients protected Dictionary m_packetHandlers = new Dictionary(); //local handlers for this instance - + public IUserServer UserServer { set @@ -224,7 +224,7 @@ namespace OpenSim else { System.Text.Encoding _enc = System.Text.Encoding.ASCII; - + switch (Pack.Type) { case PacketType.CompleteAgentMovement: @@ -272,7 +272,7 @@ namespace OpenSim if (ent.localid == parentprimid) { parentprim = (OpenSim.world.Primitive)ent; - + } } for (int i = 1; i < link.ObjectData.Length; i++) @@ -365,7 +365,7 @@ namespace OpenSim } else { - // Console.Write(Pack.ToString()); + // Console.Write(Pack.ToString()); this.CreateInventoryItem(createItem); } break; @@ -388,7 +388,7 @@ namespace OpenSim AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); if (asset != null) { - // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); + // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); } else @@ -444,7 +444,7 @@ namespace OpenSim } break; case PacketType.UpdateTaskInventory: - // Console.WriteLine(Pack.ToString()); + // Console.WriteLine(Pack.ToString()); UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); if (myinventory != null) @@ -476,16 +476,16 @@ namespace OpenSim } break; case PacketType.AgentAnimation: - AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; - for (int i = 0; i < AgentAni.AnimationList.Length; i++) - { - if (AgentAni.AnimationList[i].StartAnim) - { - ClientAvatar.current_anim = AgentAni.AnimationList[i].AnimID; - ClientAvatar.anim_seq = 1; - ClientAvatar.SendAnimPack(); - } - } + AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; + for (int i = 0; i < AgentAni.AnimationList.Length; i++) + { + if (AgentAni.AnimationList[i].StartAnim) + { + ClientAvatar.current_anim = AgentAni.AnimationList[i].AnimID; + ClientAvatar.anim_seq = 1; + ClientAvatar.SendAnimPack(); + } + } break; case PacketType.ObjectSelect: ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; @@ -828,7 +828,7 @@ namespace OpenSim }*/ m_world.RemoveViewerAgent(this); //need to do other cleaning up here too - m_clientThreads.Remove(this.CircuitCode); + m_clientThreads.Remove(this.CircuitCode); m_application.RemoveClientCircuit(this.CircuitCode); this.ClientThread.Abort(); return true; @@ -836,7 +836,7 @@ namespace OpenSim protected bool AgentTextureCached(SimClient simclient, Packet packet) { - // Console.WriteLine(packet.ToString()); + // Console.WriteLine(packet.ToString()); AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); cachedresp.AgentData.AgentID = this.AgentID; 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 client.OutPacket(objupdate); if (client.AgentID != ControllingClient.AgentID) { - client.ClientAvatar.SendAppearanceToOtherAgent(this.ControllingClient); - SendAppearanceToOtherAgent(client); + //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); } } } @@ -142,10 +145,12 @@ namespace OpenSim.world avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; 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.SessionID = userInfo.SessionID; - aw.AgentData.SerialNum = (uint)(new Random()).Next(); + aw.AgentData.SessionID = userInfo.SessionID; + 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]; AgentWearablesUpdatePacket.WearableDataBlock awb; @@ -156,8 +161,8 @@ namespace OpenSim.world awb.AssetID = this.Wearables[i].AssetID; awb.ItemID = this.Wearables[i].ItemID; aw.WearableData[i] = awb; - } - + }*/ + AvatarAppearancePacket.VisualParamBlock avblock = null; for (int i = 0; i < 218; i++) { -- cgit v1.1