diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 36 |
1 files changed, 18 insertions, 18 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 | |||
85 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients | 85 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients |
86 | 86 | ||
87 | protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance | 87 | protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance |
88 | 88 | ||
89 | public IUserServer UserServer | 89 | public IUserServer UserServer |
90 | { | 90 | { |
91 | set | 91 | set |
@@ -224,7 +224,7 @@ namespace OpenSim | |||
224 | else | 224 | else |
225 | { | 225 | { |
226 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; | 226 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; |
227 | 227 | ||
228 | switch (Pack.Type) | 228 | switch (Pack.Type) |
229 | { | 229 | { |
230 | case PacketType.CompleteAgentMovement: | 230 | case PacketType.CompleteAgentMovement: |
@@ -272,7 +272,7 @@ namespace OpenSim | |||
272 | if (ent.localid == parentprimid) | 272 | if (ent.localid == parentprimid) |
273 | { | 273 | { |
274 | parentprim = (OpenSim.world.Primitive)ent; | 274 | parentprim = (OpenSim.world.Primitive)ent; |
275 | 275 | ||
276 | } | 276 | } |
277 | } | 277 | } |
278 | for (int i = 1; i < link.ObjectData.Length; i++) | 278 | for (int i = 1; i < link.ObjectData.Length; i++) |
@@ -365,7 +365,7 @@ namespace OpenSim | |||
365 | } | 365 | } |
366 | else | 366 | else |
367 | { | 367 | { |
368 | // Console.Write(Pack.ToString()); | 368 | // Console.Write(Pack.ToString()); |
369 | this.CreateInventoryItem(createItem); | 369 | this.CreateInventoryItem(createItem); |
370 | } | 370 | } |
371 | break; | 371 | break; |
@@ -388,7 +388,7 @@ namespace OpenSim | |||
388 | AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); | 388 | AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); |
389 | if (asset != null) | 389 | if (asset != null) |
390 | { | 390 | { |
391 | // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); | 391 | // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); |
392 | m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); | 392 | m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); |
393 | } | 393 | } |
394 | else | 394 | else |
@@ -444,7 +444,7 @@ namespace OpenSim | |||
444 | } | 444 | } |
445 | break; | 445 | break; |
446 | case PacketType.UpdateTaskInventory: | 446 | case PacketType.UpdateTaskInventory: |
447 | // Console.WriteLine(Pack.ToString()); | 447 | // Console.WriteLine(Pack.ToString()); |
448 | UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; | 448 | UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; |
449 | AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); | 449 | AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); |
450 | if (myinventory != null) | 450 | if (myinventory != null) |
@@ -476,16 +476,16 @@ namespace OpenSim | |||
476 | } | 476 | } |
477 | break; | 477 | break; |
478 | case PacketType.AgentAnimation: | 478 | case PacketType.AgentAnimation: |
479 | AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; | 479 | AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; |
480 | for (int i = 0; i < AgentAni.AnimationList.Length; i++) | 480 | for (int i = 0; i < AgentAni.AnimationList.Length; i++) |
481 | { | 481 | { |
482 | if (AgentAni.AnimationList[i].StartAnim) | 482 | if (AgentAni.AnimationList[i].StartAnim) |
483 | { | 483 | { |
484 | ClientAvatar.current_anim = AgentAni.AnimationList[i].AnimID; | 484 | ClientAvatar.current_anim = AgentAni.AnimationList[i].AnimID; |
485 | ClientAvatar.anim_seq = 1; | 485 | ClientAvatar.anim_seq = 1; |
486 | ClientAvatar.SendAnimPack(); | 486 | ClientAvatar.SendAnimPack(); |
487 | } | 487 | } |
488 | } | 488 | } |
489 | break; | 489 | break; |
490 | case PacketType.ObjectSelect: | 490 | case PacketType.ObjectSelect: |
491 | ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; | 491 | ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; |
@@ -828,7 +828,7 @@ namespace OpenSim | |||
828 | }*/ | 828 | }*/ |
829 | m_world.RemoveViewerAgent(this); | 829 | m_world.RemoveViewerAgent(this); |
830 | //need to do other cleaning up here too | 830 | //need to do other cleaning up here too |
831 | m_clientThreads.Remove(this.CircuitCode); | 831 | m_clientThreads.Remove(this.CircuitCode); |
832 | m_application.RemoveClientCircuit(this.CircuitCode); | 832 | m_application.RemoveClientCircuit(this.CircuitCode); |
833 | this.ClientThread.Abort(); | 833 | this.ClientThread.Abort(); |
834 | return true; | 834 | return true; |
@@ -836,7 +836,7 @@ namespace OpenSim | |||
836 | 836 | ||
837 | protected bool AgentTextureCached(SimClient simclient, Packet packet) | 837 | protected bool AgentTextureCached(SimClient simclient, Packet packet) |
838 | { | 838 | { |
839 | // Console.WriteLine(packet.ToString()); | 839 | // Console.WriteLine(packet.ToString()); |
840 | AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; | 840 | AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; |
841 | AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); | 841 | AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); |
842 | cachedresp.AgentData.AgentID = this.AgentID; | 842 | cachedresp.AgentData.AgentID = this.AgentID; |