aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
diff options
context:
space:
mode:
authorlbsa712007-07-26 14:55:42 +0000
committerlbsa712007-07-26 14:55:42 +0000
commit39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6 (patch)
tree81ab89a9749577c6fa1a3a19c1ed09c1942ec201 /OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
parentAdded the default shape to the OpenSim library. Now need to get the new ruth ... (diff)
downloadopensim-SC_OLD-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.zip
opensim-SC_OLD-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.tar.gz
opensim-SC_OLD-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.tar.bz2
opensim-SC_OLD-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.tar.xz
* Started renaming world to Scene
* Update and UpdateMovement now first stores array to avoid collection update exceptions * Ignored some bins
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs32
1 files changed, 3 insertions, 29 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index e5e872a..c0c14ee 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.ClientStack
73 } 73 }
74 break; 74 break;
75 75
76 #region World/Avatar 76 #region Scene/Avatar
77 case PacketType.ChatFromViewer: 77 case PacketType.ChatFromViewer:
78 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; 78 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
79 if (Util.FieldToString(inchatpack.ChatData.Message) == "") 79 if (Util.FieldToString(inchatpack.ChatData.Message) == "")
@@ -466,33 +466,7 @@ namespace OpenSim.Region.ClientStack
466 // Console.WriteLine(Pack.ToString()); 466 // Console.WriteLine(Pack.ToString());
467 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; 467 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
468 AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); 468 AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
469 /*if (myinventory != null) 469
470 {
471 if (updatetask.UpdateData.Key == 0)
472 {
473 if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)
474 {
475 if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)
476 {
477 LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;
478 AssetBase assBase = this.m_assetCache.GetAsset(noteaid);
479 if (assBase != null)
480 {
481 foreach (Entity ent in m_world.Entities.Values)
482 {
483 if (ent.localid == updatetask.UpdateData.LocalID)
484 {
485 if (ent is OpenSim.world.Primitive)
486 {
487 this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
488 }
489 }
490 }
491 }
492 }
493 }
494 }
495 }*/
496 break; 470 break;
497 case PacketType.MapLayerRequest: 471 case PacketType.MapLayerRequest:
498 this.RequestMapLayer(); 472 this.RequestMapLayer();
@@ -524,7 +498,7 @@ namespace OpenSim.Region.ClientStack
524 { 498 {
525 AssetLandmark lm = new AssetLandmark(lma); 499 AssetLandmark lm = new AssetLandmark(lma);
526 500
527 if (lm.RegionID == m_world.RegionInfo.SimUUID) 501 if (lm.RegionID == m_scene.RegionInfo.SimUUID)
528 { 502 {
529 TeleportLocalPacket tpLocal = new TeleportLocalPacket(); 503 TeleportLocalPacket tpLocal = new TeleportLocalPacket();
530 504