aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorTalun2012-04-10 21:25:05 +0100
committernebadon2012-04-12 18:44:00 -0700
commit08e509978d81cb3451c205ed59648e3f5da91344 (patch)
treee8fb382ef1661c2d370c64915a05376b295c551e /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentmake changes to FlotsamCache.ini.example as noted in mantis #5960 (diff)
downloadopensim-SC_OLD-08e509978d81cb3451c205ed59648e3f5da91344.zip
opensim-SC_OLD-08e509978d81cb3451c205ed59648e3f5da91344.tar.gz
opensim-SC_OLD-08e509978d81cb3451c205ed59648e3f5da91344.tar.bz2
opensim-SC_OLD-08e509978d81cb3451c205ed59648e3f5da91344.tar.xz
Mantis 55025 Implement script time.
Signed-off-by: nebadon <michael@osgrid.org>
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 9a04c65..aacad98 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Framework.Scenes
222 /// </summary> 222 /// </summary>
223 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) 223 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
224 { 224 {
225 List<TaskInventoryItem> scripts = GetInventoryScripts(); 225 List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
226 foreach (TaskInventoryItem item in scripts) 226 foreach (TaskInventoryItem item in scripts)
227 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 227 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
228 } 228 }
@@ -255,7 +255,7 @@ namespace OpenSim.Region.Framework.Scenes
255 /// </param> 255 /// </param>
256 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 256 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
257 { 257 {
258 List<TaskInventoryItem> scripts = GetInventoryScripts(); 258 List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
259 foreach (TaskInventoryItem item in scripts) 259 foreach (TaskInventoryItem item in scripts)
260 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted); 260 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
261 } 261 }
@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.Framework.Scenes
1116 return 0; 1116 return 0;
1117 1117
1118 int count = 0; 1118 int count = 0;
1119 List<TaskInventoryItem> scripts = GetInventoryScripts(); 1119 List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
1120 1120
1121 foreach (TaskInventoryItem item in scripts) 1121 foreach (TaskInventoryItem item in scripts)
1122 { 1122 {
@@ -1157,14 +1157,14 @@ namespace OpenSim.Region.Framework.Scenes
1157 return ret; 1157 return ret;
1158 } 1158 }
1159 1159
1160 public List<TaskInventoryItem> GetInventoryScripts() 1160 public List<TaskInventoryItem> GetInventoryItems(InventoryType type)
1161 { 1161 {
1162 List<TaskInventoryItem> ret = new List<TaskInventoryItem>(); 1162 List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
1163 1163
1164 lock (m_items) 1164 lock (m_items)
1165 { 1165 {
1166 foreach (TaskInventoryItem item in m_items.Values) 1166 foreach (TaskInventoryItem item in m_items.Values)
1167 if (item.InvType == (int)InventoryType.LSL) 1167 if (item.InvType == (int)type)
1168 ret.Add(item); 1168 ret.Add(item);
1169 } 1169 }
1170 1170
@@ -1183,7 +1183,7 @@ namespace OpenSim.Region.Framework.Scenes
1183 if (engines.Length == 0) // No engine at all 1183 if (engines.Length == 0) // No engine at all
1184 return ret; 1184 return ret;
1185 1185
1186 List<TaskInventoryItem> scripts = GetInventoryScripts(); 1186 List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
1187 1187
1188 foreach (TaskInventoryItem item in scripts) 1188 foreach (TaskInventoryItem item in scripts)
1189 { 1189 {
@@ -1211,7 +1211,7 @@ namespace OpenSim.Region.Framework.Scenes
1211 if (engines.Length == 0) 1211 if (engines.Length == 0)
1212 return; 1212 return;
1213 1213
1214 List<TaskInventoryItem> scripts = GetInventoryScripts(); 1214 List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
1215 1215
1216 foreach (TaskInventoryItem item in scripts) 1216 foreach (TaskInventoryItem item in scripts)
1217 { 1217 {