aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2011-11-24 01:16:37 +0000
committerMelanie2011-11-24 01:16:37 +0000
commita8270cb48cf8dbca7595da5963d8fafdb1141529 (patch)
treecf878acca0c652239f4441c3783647b6b0b688a6 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMerge branch 'master' into bigmerge (diff)
parentAppend asset ID to URL for storage requests to allow caching proxies to work ... (diff)
downloadopensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.zip
opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.gz
opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.bz2
opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs13
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 53f0f2e..245f258 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -82,16 +82,9 @@ namespace OpenSim.Region.Framework.Scenes
82 m_log.Info("[PRIM INVENTORY]: Starting scripts in scene"); 82 m_log.Info("[PRIM INVENTORY]: Starting scripts in scene");
83 83
84 IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>(); 84 IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>();
85 if (engines != null) 85
86 { 86 foreach (IScriptModule engine in engines)
87 foreach (IScriptModule engine in engines) 87 engine.StartProcessing();
88 {
89 if (engine != null)
90 {
91 engine.StartProcessing();
92 }
93 }
94 }
95 } 88 }
96 89
97 public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item) 90 public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)