aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMW2007-08-22 14:37:54 +0000
committerMW2007-08-22 14:37:54 +0000
commitb5921e2b95305d2918f94f52a560f8c004b8bcb4 (patch)
tree7deec09890e710941ec1a9d9a9f258f5ae8d1c26 /OpenSim/Region/Environment/Scenes/Scene.cs
parentFix for un-encrypted master avatar password in user database (diff)
downloadopensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.zip
opensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.tar.gz
opensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.tar.bz2
opensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.tar.xz
Start of Task Inventory (ie prim's inventory). For now, you can only move scripts into a prim (from your user inventory) and although the script will now show up in the prims inventory, you can't make any changes to it (or delete it). Also a prim's inventory is currently not saved between restarts.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d625dec..d3aafcc 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Region.Environment.Scenes
77 protected AgentCircuitManager authenticateHandler; 77 protected AgentCircuitManager authenticateHandler;
78 protected RegionCommsListener regionCommsHost; 78 protected RegionCommsListener regionCommsHost;
79 protected CommunicationsManager commsManager; 79 protected CommunicationsManager commsManager;
80 protected XferManagaer xferManager;
80 81
81 protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); 82 protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
82 protected BaseHttpServer httpListener; 83 protected BaseHttpServer httpListener;
@@ -163,6 +164,7 @@ namespace OpenSim.Region.Environment.Scenes
163 m_scriptManager = new ScriptManager(this); 164 m_scriptManager = new ScriptManager(this);
164 m_eventManager = new EventManager(); 165 m_eventManager = new EventManager();
165 m_permissionManager = new PermissionManager(this); 166 m_permissionManager = new PermissionManager(this);
167 xferManager = new XferManagaer();
166 168
167 m_eventManager.OnParcelPrimCountAdd += 169 m_eventManager.OnParcelPrimCountAdd +=
168 m_LandManager.addPrimToLandPrimCounts; 170 m_LandManager.addPrimToLandPrimCounts;
@@ -711,6 +713,8 @@ namespace OpenSim.Region.Environment.Scenes
711 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest; 713 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest;
712 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer; 714 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer;
713 // client.OnRequestXfer += RequestXfer; 715 // client.OnRequestXfer += RequestXfer;
716 client.OnRequestXfer += xferManager.RequestXfer;
717 client.OnConfirmXfer += xferManager.AckPacket;
714 client.OnRezScript += RezScript; 718 client.OnRezScript += RezScript;
715 719
716 client.OnRequestAvatarProperties += RequestAvatarProperty; 720 client.OnRequestAvatarProperties += RequestAvatarProperty;