aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/TaskInventoryDictionary.cs111
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs21
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs38
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs390
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs16
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs532
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs36
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs22
8 files changed, 685 insertions, 481 deletions
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 25ae6b0..efe5f0c 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -27,9 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Threading;
31using System.Reflection;
30using System.Xml; 32using System.Xml;
31using System.Xml.Schema; 33using System.Xml.Schema;
32using System.Xml.Serialization; 34using System.Xml.Serialization;
35using log4net;
33using OpenMetaverse; 36using OpenMetaverse;
34 37
35namespace OpenSim.Framework 38namespace OpenSim.Framework
@@ -45,6 +48,105 @@ namespace OpenSim.Framework
45 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 49
47 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem)); 50 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52
53 private Thread LockedByThread;
54 /// <value>
55 /// An advanced lock for inventory data
56 /// </value>
57 private System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim();
58
59 /// <summary>
60 /// Are we readlocked by the calling thread?
61 /// </summary>
62 public bool IsReadLockedByMe()
63 {
64 if (m_itemLock.RecursiveReadCount > 0)
65 {
66 return true;
67 }
68 else
69 {
70 return false;
71 }
72 }
73
74 /// <summary>
75 /// Lock our inventory list for reading (many can read, one can write)
76 /// </summary>
77 public void LockItemsForRead(bool locked)
78 {
79 if (locked)
80 {
81 if (m_itemLock.IsWriteLockHeld && LockedByThread != null)
82 {
83 if (!LockedByThread.IsAlive)
84 {
85 //Locked by dead thread, reset.
86 m_itemLock = new System.Threading.ReaderWriterLockSlim();
87 }
88 }
89
90 if (m_itemLock.RecursiveReadCount > 0)
91 {
92 m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
93 m_itemLock.ExitReadLock();
94 }
95 if (m_itemLock.RecursiveWriteCount > 0)
96 {
97 m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
98 m_itemLock.ExitWriteLock();
99 }
100
101 while (!m_itemLock.TryEnterReadLock(60000))
102 {
103 m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
104 if (m_itemLock.IsWriteLockHeld)
105 {
106 m_itemLock = new System.Threading.ReaderWriterLockSlim();
107 }
108 }
109 }
110 else
111 {
112 m_itemLock.ExitReadLock();
113 }
114 }
115
116 /// <summary>
117 /// Lock our inventory list for writing (many can read, one can write)
118 /// </summary>
119 public void LockItemsForWrite(bool locked)
120 {
121 if (locked)
122 {
123 //Enter a write lock, wait indefinately for one to open.
124 if (m_itemLock.RecursiveReadCount > 0)
125 {
126 m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
127 m_itemLock.ExitReadLock();
128 }
129 if (m_itemLock.RecursiveWriteCount > 0)
130 {
131 m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
132 m_itemLock.ExitWriteLock();
133 }
134 while (!m_itemLock.TryEnterWriteLock(60000))
135 {
136 m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
137 if (m_itemLock.IsWriteLockHeld)
138 {
139 m_itemLock = new System.Threading.ReaderWriterLockSlim();
140 }
141 }
142
143 LockedByThread = Thread.CurrentThread;
144 }
145 else
146 {
147 m_itemLock.ExitWriteLock();
148 }
149 }
48 150
49 #region ICloneable Members 151 #region ICloneable Members
50 152
@@ -52,13 +154,12 @@ namespace OpenSim.Framework
52 { 154 {
53 TaskInventoryDictionary clone = new TaskInventoryDictionary(); 155 TaskInventoryDictionary clone = new TaskInventoryDictionary();
54 156
55 lock (this) 157 m_itemLock.EnterReadLock();
158 foreach (UUID uuid in Keys)
56 { 159 {
57 foreach (UUID uuid in Keys) 160 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
58 {
59 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
60 }
61 } 161 }
162 m_itemLock.ExitReadLock();
62 163
63 return clone; 164 return clone;
64 } 165 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 70a225e..f204faf 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -246,21 +246,20 @@ namespace OpenSim.Region.CoreModules.World.Archiver
246 // Fix ownership/creator of inventory items 246 // Fix ownership/creator of inventory items
247 // Not doing so results in inventory items 247 // Not doing so results in inventory items
248 // being no copy/no mod for everyone 248 // being no copy/no mod for everyone
249 lock (part.TaskInventory) 249 part.TaskInventory.LockItemsForRead(true);
250 TaskInventoryDictionary inv = part.TaskInventory;
251 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
250 { 252 {
251 TaskInventoryDictionary inv = part.TaskInventory; 253 if (!ResolveUserUuid(kvp.Value.OwnerID))
252 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
253 { 254 {
254 if (!ResolveUserUuid(kvp.Value.OwnerID)) 255 kvp.Value.OwnerID = masterAvatarId;
255 { 256 }
256 kvp.Value.OwnerID = masterAvatarId; 257 if (!ResolveUserUuid(kvp.Value.CreatorID))
257 } 258 {
258 if (!ResolveUserUuid(kvp.Value.CreatorID)) 259 kvp.Value.CreatorID = masterAvatarId;
259 {
260 kvp.Value.CreatorID = masterAvatarId;
261 }
262 } 260 }
263 } 261 }
262 part.TaskInventory.LockItemsForRead(false);
264 } 263 }
265 264
266 if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) 265 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index cdec135..bbece2f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -389,12 +389,16 @@ namespace OpenSim.Region.Framework.Scenes
389 } 389 }
390 390
391 /// <value> 391 /// <value>
392 /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes 392 /// Get the inventory list
393 /// </value> 393 /// </value>
394 public TaskInventoryDictionary TaskInventory 394 public TaskInventoryDictionary TaskInventory
395 { 395 {
396 get { return m_inventory.Items; } 396 get {
397 set { m_inventory.Items = value; } 397 return m_inventory.Items;
398 }
399 set {
400 m_inventory.Items = value;
401 }
398 } 402 }
399 403
400 public uint ObjectFlags 404 public uint ObjectFlags
@@ -2101,17 +2105,18 @@ namespace OpenSim.Region.Framework.Scenes
2101 //Trys to fetch sound id from prim's inventory. 2105 //Trys to fetch sound id from prim's inventory.
2102 //Prim's inventory doesn't support non script items yet 2106 //Prim's inventory doesn't support non script items yet
2103 2107
2104 lock (TaskInventory) 2108 TaskInventory.LockItemsForRead(true);
2109
2110 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2105 { 2111 {
2106 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 2112 if (item.Value.Name == sound)
2107 { 2113 {
2108 if (item.Value.Name == sound) 2114 soundID = item.Value.ItemID;
2109 { 2115 break;
2110 soundID = item.Value.ItemID;
2111 break;
2112 }
2113 } 2116 }
2114 } 2117 }
2118
2119 TaskInventory.LockItemsForRead(false);
2115 } 2120 }
2116 2121
2117 List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars(); 2122 List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars();
@@ -2457,17 +2462,16 @@ namespace OpenSim.Region.Framework.Scenes
2457 if (!UUID.TryParse(sound, out soundID)) 2462 if (!UUID.TryParse(sound, out soundID))
2458 { 2463 {
2459 // search sound file from inventory 2464 // search sound file from inventory
2460 lock (TaskInventory) 2465 TaskInventory.LockItemsForRead(true);
2466 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2461 { 2467 {
2462 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 2468 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound)
2463 { 2469 {
2464 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound) 2470 soundID = item.Value.ItemID;
2465 { 2471 break;
2466 soundID = item.Value.ItemID;
2467 break;
2468 }
2469 } 2472 }
2470 } 2473 }
2474 TaskInventory.LockItemsForRead(false);
2471 } 2475 }
2472 2476
2473 if (soundID == UUID.Zero) 2477 if (soundID == UUID.Zero)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index f4ca877..4dc709e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -80,7 +80,9 @@ namespace OpenSim.Region.Framework.Scenes
80 /// </value> 80 /// </value>
81 protected internal TaskInventoryDictionary Items 81 protected internal TaskInventoryDictionary Items
82 { 82 {
83 get { return m_items; } 83 get {
84 return m_items;
85 }
84 set 86 set
85 { 87 {
86 m_items = value; 88 m_items = value;
@@ -116,22 +118,25 @@ namespace OpenSim.Region.Framework.Scenes
116 /// <param name="linkNum">Link number for the part</param> 118 /// <param name="linkNum">Link number for the part</param>
117 public void ResetInventoryIDs() 119 public void ResetInventoryIDs()
118 { 120 {
119 lock (Items) 121 m_items.LockItemsForWrite(true);
122
123 if (0 == Items.Count)
120 { 124 {
121 if (0 == Items.Count) 125 m_items.LockItemsForWrite(false);
122 return; 126 return;
127 }
123 128
124 HasInventoryChanged = true; 129 HasInventoryChanged = true;
125 m_part.ParentGroup.HasGroupChanged = true; 130 m_part.ParentGroup.HasGroupChanged = true;
126 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 131 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
127 Items.Clear(); 132 Items.Clear();
128 133
129 foreach (TaskInventoryItem item in items) 134 foreach (TaskInventoryItem item in items)
130 { 135 {
131 item.ResetIDs(m_part.UUID); 136 item.ResetIDs(m_part.UUID);
132 Items.Add(item.ItemID, item); 137 Items.Add(item.ItemID, item);
133 }
134 } 138 }
139 m_items.LockItemsForWrite(false);
135 } 140 }
136 141
137 /// <summary> 142 /// <summary>
@@ -140,25 +145,25 @@ namespace OpenSim.Region.Framework.Scenes
140 /// <param name="ownerId"></param> 145 /// <param name="ownerId"></param>
141 public void ChangeInventoryOwner(UUID ownerId) 146 public void ChangeInventoryOwner(UUID ownerId)
142 { 147 {
143 lock (Items) 148 m_items.LockItemsForWrite(true);
149 if (0 == Items.Count)
144 { 150 {
145 if (0 == Items.Count) 151 m_items.LockItemsForWrite(false);
146 { 152 return;
147 return; 153 }
148 }
149 154
150 HasInventoryChanged = true; 155 HasInventoryChanged = true;
151 m_part.ParentGroup.HasGroupChanged = true; 156 m_part.ParentGroup.HasGroupChanged = true;
152 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 157 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
153 foreach (TaskInventoryItem item in items) 158 foreach (TaskInventoryItem item in items)
159 {
160 if (ownerId != item.OwnerID)
154 { 161 {
155 if (ownerId != item.OwnerID) 162 item.LastOwnerID = item.OwnerID;
156 { 163 item.OwnerID = ownerId;
157 item.LastOwnerID = item.OwnerID;
158 item.OwnerID = ownerId;
159 }
160 } 164 }
161 } 165 }
166 m_items.LockItemsForWrite(false);
162 } 167 }
163 168
164 /// <summary> 169 /// <summary>
@@ -167,24 +172,24 @@ namespace OpenSim.Region.Framework.Scenes
167 /// <param name="groupID"></param> 172 /// <param name="groupID"></param>
168 public void ChangeInventoryGroup(UUID groupID) 173 public void ChangeInventoryGroup(UUID groupID)
169 { 174 {
170 lock (Items) 175 m_items.LockItemsForWrite(true);
176 if (0 == Items.Count)
171 { 177 {
172 if (0 == Items.Count) 178 m_items.LockItemsForWrite(false);
173 { 179 return;
174 return; 180 }
175 }
176 181
177 HasInventoryChanged = true; 182 HasInventoryChanged = true;
178 m_part.ParentGroup.HasGroupChanged = true; 183 m_part.ParentGroup.HasGroupChanged = true;
179 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 184 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
180 foreach (TaskInventoryItem item in items) 185 foreach (TaskInventoryItem item in items)
186 {
187 if (groupID != item.GroupID)
181 { 188 {
182 if (groupID != item.GroupID) 189 item.GroupID = groupID;
183 {
184 item.GroupID = groupID;
185 }
186 } 190 }
187 } 191 }
192 m_items.LockItemsForWrite(false);
188 } 193 }
189 194
190 /// <summary> 195 /// <summary>
@@ -192,14 +197,14 @@ namespace OpenSim.Region.Framework.Scenes
192 /// </summary> 197 /// </summary>
193 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) 198 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
194 { 199 {
195 lock (m_items) 200 Items.LockItemsForRead(true);
201 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
202 Items.LockItemsForRead(false);
203 foreach (TaskInventoryItem item in items)
196 { 204 {
197 foreach (TaskInventoryItem item in Items.Values) 205 if ((int)InventoryType.LSL == item.InvType)
198 { 206 {
199 if ((int)InventoryType.LSL == item.InvType) 207 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
200 {
201 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
202 }
203 } 208 }
204 } 209 }
205 } 210 }
@@ -209,17 +214,20 @@ namespace OpenSim.Region.Framework.Scenes
209 /// </summary> 214 /// </summary>
210 public void RemoveScriptInstances() 215 public void RemoveScriptInstances()
211 { 216 {
212 lock (Items) 217 Items.LockItemsForRead(true);
218 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
219 Items.LockItemsForRead(false);
220
221 foreach (TaskInventoryItem item in items)
213 { 222 {
214 foreach (TaskInventoryItem item in Items.Values) 223 if ((int)InventoryType.LSL == item.InvType)
215 { 224 {
216 if ((int)InventoryType.LSL == item.InvType) 225 RemoveScriptInstance(item.ItemID);
217 { 226 m_part.RemoveScriptEvents(item.ItemID);
218 RemoveScriptInstance(item.ItemID);
219 m_part.RemoveScriptEvents(item.ItemID);
220 }
221 } 227 }
222 } 228 }
229
230
223 } 231 }
224 232
225 /// <summary> 233 /// <summary>
@@ -244,8 +252,10 @@ namespace OpenSim.Region.Framework.Scenes
244 if (stateSource == 1 && // Prim crossing 252 if (stateSource == 1 && // Prim crossing
245 m_part.ParentGroup.Scene.m_trustBinaries) 253 m_part.ParentGroup.Scene.m_trustBinaries)
246 { 254 {
255 m_items.LockItemsForWrite(true);
247 m_items[item.ItemID].PermsMask = 0; 256 m_items[item.ItemID].PermsMask = 0;
248 m_items[item.ItemID].PermsGranter = UUID.Zero; 257 m_items[item.ItemID].PermsGranter = UUID.Zero;
258 m_items.LockItemsForWrite(false);
249 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 259 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
250 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource); 260 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource);
251 m_part.ParentGroup.AddActiveScriptCount(1); 261 m_part.ParentGroup.AddActiveScriptCount(1);
@@ -266,8 +276,10 @@ namespace OpenSim.Region.Framework.Scenes
266 { 276 {
267 if (m_part.ParentGroup.m_savedScriptState != null) 277 if (m_part.ParentGroup.m_savedScriptState != null)
268 RestoreSavedScriptState(item.OldItemID, item.ItemID); 278 RestoreSavedScriptState(item.OldItemID, item.ItemID);
279 m_items.LockItemsForWrite(true);
269 m_items[item.ItemID].PermsMask = 0; 280 m_items[item.ItemID].PermsMask = 0;
270 m_items[item.ItemID].PermsGranter = UUID.Zero; 281 m_items[item.ItemID].PermsGranter = UUID.Zero;
282 m_items.LockItemsForWrite(false);
271 string script = Utils.BytesToString(asset.Data); 283 string script = Utils.BytesToString(asset.Data);
272 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 284 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
273 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource); 285 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
@@ -302,20 +314,22 @@ namespace OpenSim.Region.Framework.Scenes
302 /// </param> 314 /// </param>
303 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource) 315 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
304 { 316 {
305 lock (m_items) 317 m_items.LockItemsForRead(true);
318 if (m_items.ContainsKey(itemId))
306 { 319 {
307 if (m_items.ContainsKey(itemId)) 320 TaskInventoryItem item = m_items[itemId];
308 { 321 m_items.LockItemsForRead(false);
309 CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource); 322 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
310 }
311 else
312 {
313 m_log.ErrorFormat(
314 "[PRIM INVENTORY]: " +
315 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}",
316 itemId, m_part.Name, m_part.UUID);
317 }
318 } 323 }
324 else
325 {
326 m_items.LockItemsForRead(false);
327 m_log.ErrorFormat(
328 "[PRIM INVENTORY]: " +
329 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}",
330 itemId, m_part.Name, m_part.UUID);
331 }
332
319 } 333 }
320 334
321 /// <summary> 335 /// <summary>
@@ -346,11 +360,16 @@ namespace OpenSim.Region.Framework.Scenes
346 /// <returns></returns> 360 /// <returns></returns>
347 private bool InventoryContainsName(string name) 361 private bool InventoryContainsName(string name)
348 { 362 {
349 foreach (TaskInventoryItem item in Items.Values) 363 m_items.LockItemsForRead(true);
364 foreach (TaskInventoryItem item in m_items.Values)
350 { 365 {
351 if (item.Name == name) 366 if (item.Name == name)
367 {
368 m_items.LockItemsForRead(false);
352 return true; 369 return true;
370 }
353 } 371 }
372 m_items.LockItemsForRead(false);
354 return false; 373 return false;
355 } 374 }
356 375
@@ -392,7 +411,9 @@ namespace OpenSim.Region.Framework.Scenes
392 /// <param name="item"></param> 411 /// <param name="item"></param>
393 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) 412 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
394 { 413 {
414 m_items.LockItemsForRead(true);
395 List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values); 415 List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values);
416 m_items.LockItemsForRead(false);
396 foreach (TaskInventoryItem i in il) 417 foreach (TaskInventoryItem i in il)
397 { 418 {
398 if (i.Name == item.Name) 419 if (i.Name == item.Name)
@@ -429,15 +450,14 @@ namespace OpenSim.Region.Framework.Scenes
429 item.ParentPartID = m_part.UUID; 450 item.ParentPartID = m_part.UUID;
430 item.Name = name; 451 item.Name = name;
431 452
432 lock (m_items) 453 m_items.LockItemsForWrite(true);
433 { 454 m_items.Add(item.ItemID, item);
434 m_items.Add(item.ItemID, item); 455 m_items.LockItemsForWrite(false);
435
436 if (allowedDrop) 456 if (allowedDrop)
437 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); 457 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
438 else 458 else
439 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 459 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
440 } 460
441 461
442 m_inventorySerial++; 462 m_inventorySerial++;
443 //m_inventorySerial += 2; 463 //m_inventorySerial += 2;
@@ -454,14 +474,13 @@ namespace OpenSim.Region.Framework.Scenes
454 /// <param name="items"></param> 474 /// <param name="items"></param>
455 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items) 475 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
456 { 476 {
457 lock (m_items) 477 m_items.LockItemsForWrite(true);
478 foreach (TaskInventoryItem item in items)
458 { 479 {
459 foreach (TaskInventoryItem item in items) 480 m_items.Add(item.ItemID, item);
460 { 481 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
461 m_items.Add(item.ItemID, item);
462 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
463 }
464 } 482 }
483 m_items.LockItemsForWrite(false);
465 484
466 m_inventorySerial++; 485 m_inventorySerial++;
467 } 486 }
@@ -474,8 +493,9 @@ namespace OpenSim.Region.Framework.Scenes
474 public TaskInventoryItem GetInventoryItem(UUID itemId) 493 public TaskInventoryItem GetInventoryItem(UUID itemId)
475 { 494 {
476 TaskInventoryItem item; 495 TaskInventoryItem item;
496 m_items.LockItemsForRead(true);
477 m_items.TryGetValue(itemId, out item); 497 m_items.TryGetValue(itemId, out item);
478 498 m_items.LockItemsForRead(false);
479 return item; 499 return item;
480 } 500 }
481 501
@@ -487,45 +507,45 @@ namespace OpenSim.Region.Framework.Scenes
487 /// <returns>false if the item did not exist, true if the update occurred successfully</returns> 507 /// <returns>false if the item did not exist, true if the update occurred successfully</returns>
488 public bool UpdateInventoryItem(TaskInventoryItem item) 508 public bool UpdateInventoryItem(TaskInventoryItem item)
489 { 509 {
490 lock (m_items) 510 m_items.LockItemsForWrite(true);
511
512 if (m_items.ContainsKey(item.ItemID))
491 { 513 {
492 if (m_items.ContainsKey(item.ItemID)) 514 item.ParentID = m_part.UUID;
515 item.ParentPartID = m_part.UUID;
516 item.Flags = m_items[item.ItemID].Flags;
517 if (item.AssetID == UUID.Zero)
493 { 518 {
494 item.ParentID = m_part.UUID; 519 item.AssetID = m_items[item.ItemID].AssetID;
495 item.ParentPartID = m_part.UUID; 520 }
496 item.Flags = m_items[item.ItemID].Flags; 521 else if ((InventoryType)item.Type == InventoryType.Notecard)
497 if (item.AssetID == UUID.Zero) 522 {
498 { 523 ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID);
499 item.AssetID = m_items[item.ItemID].AssetID;
500 }
501 else if ((InventoryType)item.Type == InventoryType.Notecard)
502 {
503 ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID);
504 524
505 if (presence != null) 525 if (presence != null)
506 { 526 {
507 presence.ControllingClient.SendAgentAlertMessage( 527 presence.ControllingClient.SendAgentAlertMessage(
508 "Notecard saved", false); 528 "Notecard saved", false);
509 }
510 } 529 }
530 }
511 531
512 m_items[item.ItemID] = item; 532 m_items[item.ItemID] = item;
513 m_inventorySerial++; 533 m_inventorySerial++;
514 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 534 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
515
516 HasInventoryChanged = true;
517 m_part.ParentGroup.HasGroupChanged = true;
518 535
519 return true; 536 HasInventoryChanged = true;
520 } 537 m_part.ParentGroup.HasGroupChanged = true;
521 else 538 m_items.LockItemsForWrite(false);
522 { 539 return true;
523 m_log.ErrorFormat( 540 }
524 "[PRIM INVENTORY]: " + 541 else
525 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 542 {
526 item.ItemID, m_part.Name, m_part.UUID); 543 m_log.ErrorFormat(
527 } 544 "[PRIM INVENTORY]: " +
545 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
546 item.ItemID, m_part.Name, m_part.UUID);
528 } 547 }
548 m_items.LockItemsForWrite(false);
529 549
530 return false; 550 return false;
531 } 551 }
@@ -538,51 +558,54 @@ namespace OpenSim.Region.Framework.Scenes
538 /// in this prim's inventory.</returns> 558 /// in this prim's inventory.</returns>
539 public int RemoveInventoryItem(UUID itemID) 559 public int RemoveInventoryItem(UUID itemID)
540 { 560 {
541 lock (m_items) 561 m_items.LockItemsForRead(true);
562
563 if (m_items.ContainsKey(itemID))
542 { 564 {
543 if (m_items.ContainsKey(itemID)) 565 int type = m_items[itemID].InvType;
566 m_items.LockItemsForRead(false);
567 if (type == 10) // Script
544 { 568 {
545 int type = m_items[itemID].InvType; 569 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
546 if (type == 10) // Script 570 }
547 { 571 m_items.LockItemsForWrite(true);
548 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); 572 m_items.Remove(itemID);
549 } 573 m_items.LockItemsForWrite(false);
550 m_items.Remove(itemID); 574 m_inventorySerial++;
551 m_inventorySerial++; 575 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
552 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
553
554 HasInventoryChanged = true;
555 m_part.ParentGroup.HasGroupChanged = true;
556 576
557 int scriptcount = 0; 577 HasInventoryChanged = true;
558 lock (m_items) 578 m_part.ParentGroup.HasGroupChanged = true;
559 {
560 foreach (TaskInventoryItem item in m_items.Values)
561 {
562 if (item.Type == 10)
563 {
564 scriptcount++;
565 }
566 }
567 }
568 579
569 if (scriptcount <= 0) 580 int scriptcount = 0;
581 m_items.LockItemsForRead(true);
582 foreach (TaskInventoryItem item in m_items.Values)
583 {
584 if (item.Type == 10)
570 { 585 {
571 m_part.RemFlag(PrimFlags.Scripted); 586 scriptcount++;
572 } 587 }
573
574 m_part.ScheduleFullUpdate();
575
576 return type;
577 } 588 }
578 else 589 m_items.LockItemsForRead(false);
590
591
592 if (scriptcount <= 0)
579 { 593 {
580 m_log.ErrorFormat( 594 m_part.RemFlag(PrimFlags.Scripted);
581 "[PRIM INVENTORY]: " +
582 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
583 itemID, m_part.Name, m_part.UUID);
584 } 595 }
596
597 m_part.ScheduleFullUpdate();
598
599 return type;
600 }
601 else
602 {
603 m_log.ErrorFormat(
604 "[PRIM INVENTORY]: " +
605 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
606 itemID, m_part.Name, m_part.UUID);
585 } 607 }
608 m_items.LockItemsForWrite(false);
586 609
587 return -1; 610 return -1;
588 } 611 }
@@ -635,52 +658,53 @@ namespace OpenSim.Region.Framework.Scenes
635 // isn't available (such as drag from prim inventory to agent inventory) 658 // isn't available (such as drag from prim inventory to agent inventory)
636 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero); 659 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
637 660
638 lock (m_items) 661 m_items.LockItemsForRead(true);
662
663 foreach (TaskInventoryItem item in m_items.Values)
639 { 664 {
640 foreach (TaskInventoryItem item in m_items.Values) 665 UUID ownerID = item.OwnerID;
641 { 666 uint everyoneMask = 0;
642 UUID ownerID = item.OwnerID; 667 uint baseMask = item.BasePermissions;
643 uint everyoneMask = 0; 668 uint ownerMask = item.CurrentPermissions;
644 uint baseMask = item.BasePermissions;
645 uint ownerMask = item.CurrentPermissions;
646 669
647 invString.AddItemStart(); 670 invString.AddItemStart();
648 invString.AddNameValueLine("item_id", item.ItemID.ToString()); 671 invString.AddNameValueLine("item_id", item.ItemID.ToString());
649 invString.AddNameValueLine("parent_id", m_part.UUID.ToString()); 672 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
650 673
651 invString.AddPermissionsStart(); 674 invString.AddPermissionsStart();
652 675
653 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask)); 676 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
654 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask)); 677 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
655 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0)); 678 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
656 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask)); 679 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
657 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions)); 680 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
658 681
659 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 682 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
660 invString.AddNameValueLine("owner_id", ownerID.ToString()); 683 invString.AddNameValueLine("owner_id", ownerID.ToString());
661 684
662 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); 685 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
663 686
664 invString.AddNameValueLine("group_id", item.GroupID.ToString()); 687 invString.AddNameValueLine("group_id", item.GroupID.ToString());
665 invString.AddSectionEnd(); 688 invString.AddSectionEnd();
666 689
667 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 690 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
668 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 691 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
669 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 692 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
670 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); 693 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
671 694
672 invString.AddSaleStart(); 695 invString.AddSaleStart();
673 invString.AddNameValueLine("sale_type", "not"); 696 invString.AddNameValueLine("sale_type", "not");
674 invString.AddNameValueLine("sale_price", "0"); 697 invString.AddNameValueLine("sale_price", "0");
675 invString.AddSectionEnd(); 698 invString.AddSectionEnd();
676 699
677 invString.AddNameValueLine("name", item.Name + "|"); 700 invString.AddNameValueLine("name", item.Name + "|");
678 invString.AddNameValueLine("desc", item.Description + "|"); 701 invString.AddNameValueLine("desc", item.Description + "|");
679 702
680 invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); 703 invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
681 invString.AddSectionEnd(); 704 invString.AddSectionEnd();
682 }
683 } 705 }
706 int count = m_items.Count;
707 m_items.LockItemsForRead(false);
684 708
685 fileData = Utils.StringToBytes(invString.BuildString); 709 fileData = Utils.StringToBytes(invString.BuildString);
686 710
@@ -689,6 +713,7 @@ namespace OpenSim.Region.Framework.Scenes
689 713
690 if (fileData.Length > 2) 714 if (fileData.Length > 2)
691 { 715 {
716 m_log.Debug("Sending task inventory list of " + count.ToString() + " items to client " + client.AgentId.ToString());
692 xferManager.AddNewFile(m_inventoryFileName, fileData); 717 xferManager.AddNewFile(m_inventoryFileName, fileData);
693 } 718 }
694 } 719 }
@@ -701,10 +726,9 @@ namespace OpenSim.Region.Framework.Scenes
701 { 726 {
702 if (HasInventoryChanged) 727 if (HasInventoryChanged)
703 { 728 {
704 lock (Items) 729 Items.LockItemsForRead(true);
705 { 730 datastore.StorePrimInventory(m_part.UUID, Items.Values);
706 datastore.StorePrimInventory(m_part.UUID, Items.Values); 731 Items.LockItemsForRead(false);
707 }
708 732
709 HasInventoryChanged = false; 733 HasInventoryChanged = false;
710 } 734 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4e5fee1..4c8c94f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1615,21 +1615,19 @@ namespace OpenSim.Region.Framework.Scenes
1615 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); 1615 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
1616 if (part != null) 1616 if (part != null)
1617 { 1617 {
1618 part.TaskInventory.LockItemsForRead(true);
1618 TaskInventoryDictionary taskIDict = part.TaskInventory; 1619 TaskInventoryDictionary taskIDict = part.TaskInventory;
1619 if (taskIDict != null) 1620 if (taskIDict != null)
1620 { 1621 {
1621 lock (taskIDict) 1622 foreach (UUID taskID in taskIDict.Keys)
1622 { 1623 {
1623 foreach (UUID taskID in taskIDict.Keys) 1624 UnRegisterControlEventsToScript(LocalId, taskID);
1624 { 1625 taskIDict[taskID].PermsMask &= ~(
1625 UnRegisterControlEventsToScript(LocalId, taskID); 1626 2048 | //PERMISSION_CONTROL_CAMERA
1626 taskIDict[taskID].PermsMask &= ~( 1627 4); // PERMISSION_TAKE_CONTROLS
1627 2048 | //PERMISSION_CONTROL_CAMERA
1628 4); // PERMISSION_TAKE_CONTROLS
1629 }
1630 } 1628 }
1631
1632 } 1629 }
1630 part.TaskInventory.LockItemsForRead(false);
1633 // Reset sit target. 1631 // Reset sit target.
1634 if (part.GetAvatarOnSitTarget() == UUID) 1632 if (part.GetAvatarOnSitTarget() == UUID)
1635 part.SetAvatarOnSitTarget(UUID.Zero); 1633 part.SetAvatarOnSitTarget(UUID.Zero);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b549b5c..a94cd46 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -275,40 +275,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
275 protected UUID InventorySelf() 275 protected UUID InventorySelf()
276 { 276 {
277 UUID invItemID = new UUID(); 277 UUID invItemID = new UUID();
278 278 bool unlock = false;
279 lock (m_host.TaskInventory) 279 if (!m_host.TaskInventory.IsReadLockedByMe())
280 {
281 m_host.TaskInventory.LockItemsForRead(true);
282 unlock = true;
283 }
284 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
280 { 285 {
281 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 286 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
282 { 287 {
283 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 288 invItemID = inv.Key;
284 { 289 break;
285 invItemID = inv.Key;
286 break;
287 }
288 } 290 }
289 } 291 }
290 292 if (unlock)
293 {
294 m_host.TaskInventory.LockItemsForRead(false);
295 }
291 return invItemID; 296 return invItemID;
292 } 297 }
293 298
294 protected UUID InventoryKey(string name, int type) 299 protected UUID InventoryKey(string name, int type)
295 { 300 {
296 m_host.AddScriptLPS(1); 301 m_host.AddScriptLPS(1);
297 302 m_host.TaskInventory.LockItemsForRead(true);
298 lock (m_host.TaskInventory) 303
304 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
299 { 305 {
300 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 306 if (inv.Value.Name == name)
301 { 307 {
302 if (inv.Value.Name == name) 308 m_host.TaskInventory.LockItemsForRead(false);
309
310 if (inv.Value.Type != type)
303 { 311 {
304 if (inv.Value.Type != type) 312 return UUID.Zero;
305 return UUID.Zero;
306
307 return inv.Value.AssetID;
308 } 313 }
314
315 return inv.Value.AssetID;
309 } 316 }
310 } 317 }
311 318
319 m_host.TaskInventory.LockItemsForRead(false);
312 return UUID.Zero; 320 return UUID.Zero;
313 } 321 }
314 322
@@ -316,17 +324,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
316 { 324 {
317 m_host.AddScriptLPS(1); 325 m_host.AddScriptLPS(1);
318 326
319 lock (m_host.TaskInventory) 327
328 m_host.TaskInventory.LockItemsForRead(true);
329
330 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
320 { 331 {
321 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 332 if (inv.Value.Name == name)
322 { 333 {
323 if (inv.Value.Name == name) 334 m_host.TaskInventory.LockItemsForRead(false);
324 { 335 return inv.Value.AssetID;
325 return inv.Value.AssetID;
326 }
327 } 336 }
328 } 337 }
329 338
339 m_host.TaskInventory.LockItemsForRead(false);
340
341
330 return UUID.Zero; 342 return UUID.Zero;
331 } 343 }
332 344
@@ -2537,12 +2549,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2537 2549
2538 m_host.AddScriptLPS(1); 2550 m_host.AddScriptLPS(1);
2539 2551
2552 m_host.TaskInventory.LockItemsForRead(true);
2540 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2553 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2541 2554 m_host.TaskInventory.LockItemsForRead(false);
2542 lock (m_host.TaskInventory)
2543 {
2544 item = m_host.TaskInventory[invItemID];
2545 }
2546 2555
2547 if (item.PermsGranter == UUID.Zero) 2556 if (item.PermsGranter == UUID.Zero)
2548 return 0; 2557 return 0;
@@ -2617,6 +2626,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2617 if (dist > m_ScriptDistanceFactor * 10.0f) 2626 if (dist > m_ScriptDistanceFactor * 10.0f)
2618 return; 2627 return;
2619 2628
2629 //Clone is thread-safe
2620 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 2630 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2621 2631
2622 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 2632 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2750,13 +2760,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2750 { 2760 {
2751 TaskInventoryItem item; 2761 TaskInventoryItem item;
2752 2762
2753 lock (m_host.TaskInventory) 2763 m_host.TaskInventory.LockItemsForRead(true);
2764 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2754 { 2765 {
2755 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 2766 m_host.TaskInventory.LockItemsForRead(false);
2756 return; 2767 return;
2757 else 2768 }
2758 item = m_host.TaskInventory[InventorySelf()]; 2769 else
2770 {
2771 item = m_host.TaskInventory[InventorySelf()];
2759 } 2772 }
2773 m_host.TaskInventory.LockItemsForRead(false);
2760 2774
2761 if (item.PermsGranter != UUID.Zero) 2775 if (item.PermsGranter != UUID.Zero)
2762 { 2776 {
@@ -2778,13 +2792,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2778 { 2792 {
2779 TaskInventoryItem item; 2793 TaskInventoryItem item;
2780 2794
2795 m_host.TaskInventory.LockItemsForRead(true);
2781 lock (m_host.TaskInventory) 2796 lock (m_host.TaskInventory)
2782 { 2797 {
2798
2783 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 2799 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2800 {
2801 m_host.TaskInventory.LockItemsForRead(false);
2784 return; 2802 return;
2803 }
2785 else 2804 else
2805 {
2786 item = m_host.TaskInventory[InventorySelf()]; 2806 item = m_host.TaskInventory[InventorySelf()];
2807 }
2787 } 2808 }
2809 m_host.TaskInventory.LockItemsForRead(false);
2788 2810
2789 m_host.AddScriptLPS(1); 2811 m_host.AddScriptLPS(1);
2790 2812
@@ -2821,14 +2843,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2821 2843
2822 TaskInventoryItem item; 2844 TaskInventoryItem item;
2823 2845
2824 lock (m_host.TaskInventory) 2846 m_host.TaskInventory.LockItemsForRead(true);
2847
2848 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2825 { 2849 {
2826 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 2850 m_host.TaskInventory.LockItemsForRead(false);
2827 return; 2851 return;
2828 else 2852 }
2829 item = m_host.TaskInventory[InventorySelf()]; 2853 else
2854 {
2855 item = m_host.TaskInventory[InventorySelf()];
2830 } 2856 }
2831 2857
2858 m_host.TaskInventory.LockItemsForRead(false);
2859
2832 if (item.PermsGranter != m_host.OwnerID) 2860 if (item.PermsGranter != m_host.OwnerID)
2833 return; 2861 return;
2834 2862
@@ -2853,13 +2881,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2853 2881
2854 TaskInventoryItem item; 2882 TaskInventoryItem item;
2855 2883
2856 lock (m_host.TaskInventory) 2884 m_host.TaskInventory.LockItemsForRead(true);
2885
2886 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2857 { 2887 {
2858 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 2888 m_host.TaskInventory.LockItemsForRead(false);
2859 return; 2889 return;
2860 else 2890 }
2861 item = m_host.TaskInventory[InventorySelf()]; 2891 else
2892 {
2893 item = m_host.TaskInventory[InventorySelf()];
2862 } 2894 }
2895 m_host.TaskInventory.LockItemsForRead(false);
2896
2863 2897
2864 if (item.PermsGranter != m_host.OwnerID) 2898 if (item.PermsGranter != m_host.OwnerID)
2865 return; 2899 return;
@@ -3083,14 +3117,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3083 3117
3084 TaskInventoryItem item; 3118 TaskInventoryItem item;
3085 3119
3086 lock (m_host.TaskInventory) 3120 m_host.TaskInventory.LockItemsForRead(true);
3121 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3087 { 3122 {
3088 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3123 m_host.TaskInventory.LockItemsForRead(false);
3089 return; 3124 return;
3090 else
3091 item = m_host.TaskInventory[InventorySelf()];
3092 } 3125 }
3093 3126 else
3127 {
3128 item = m_host.TaskInventory[InventorySelf()];
3129 }
3130 m_host.TaskInventory.LockItemsForRead(false);
3094 if (item.PermsGranter == UUID.Zero) 3131 if (item.PermsGranter == UUID.Zero)
3095 return; 3132 return;
3096 3133
@@ -3120,13 +3157,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3120 3157
3121 TaskInventoryItem item; 3158 TaskInventoryItem item;
3122 3159
3123 lock (m_host.TaskInventory) 3160 m_host.TaskInventory.LockItemsForRead(true);
3161 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3124 { 3162 {
3125 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3163 m_host.TaskInventory.LockItemsForRead(false);
3126 return; 3164 return;
3127 else
3128 item = m_host.TaskInventory[InventorySelf()];
3129 } 3165 }
3166 else
3167 {
3168 item = m_host.TaskInventory[InventorySelf()];
3169 }
3170 m_host.TaskInventory.LockItemsForRead(false);
3171
3130 3172
3131 if (item.PermsGranter == UUID.Zero) 3173 if (item.PermsGranter == UUID.Zero)
3132 return; 3174 return;
@@ -3199,10 +3241,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3199 3241
3200 TaskInventoryItem item; 3242 TaskInventoryItem item;
3201 3243
3202 lock (m_host.TaskInventory) 3244
3245 m_host.TaskInventory.LockItemsForRead(true);
3246 if (!m_host.TaskInventory.ContainsKey(invItemID))
3247 {
3248 m_host.TaskInventory.LockItemsForRead(false);
3249 return;
3250 }
3251 else
3203 { 3252 {
3204 item = m_host.TaskInventory[invItemID]; 3253 item = m_host.TaskInventory[invItemID];
3205 } 3254 }
3255 m_host.TaskInventory.LockItemsForRead(false);
3206 3256
3207 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3257 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3208 { 3258 {
@@ -3234,11 +3284,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3234 3284
3235 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3285 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3236 { 3286 {
3237 lock (m_host.TaskInventory) 3287 m_host.TaskInventory.LockItemsForWrite(true);
3238 { 3288 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3239 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3289 m_host.TaskInventory[invItemID].PermsMask = perm;
3240 m_host.TaskInventory[invItemID].PermsMask = perm; 3290 m_host.TaskInventory.LockItemsForWrite(false);
3241 }
3242 3291
3243 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3292 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3244 "run_time_permissions", new Object[] { 3293 "run_time_permissions", new Object[] {
@@ -3258,11 +3307,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3258 3307
3259 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3308 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3260 { 3309 {
3261 lock (m_host.TaskInventory) 3310 m_host.TaskInventory.LockItemsForWrite(true);
3262 { 3311 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3263 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3312 m_host.TaskInventory[invItemID].PermsMask = perm;
3264 m_host.TaskInventory[invItemID].PermsMask = perm; 3313 m_host.TaskInventory.LockItemsForWrite(false);
3265 }
3266 3314
3267 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3315 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3268 "run_time_permissions", new Object[] { 3316 "run_time_permissions", new Object[] {
@@ -3283,11 +3331,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3283 3331
3284 if (!m_waitingForScriptAnswer) 3332 if (!m_waitingForScriptAnswer)
3285 { 3333 {
3286 lock (m_host.TaskInventory) 3334 m_host.TaskInventory.LockItemsForWrite(true);
3287 { 3335 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3288 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3336 m_host.TaskInventory[invItemID].PermsMask = 0;
3289 m_host.TaskInventory[invItemID].PermsMask = 0; 3337 m_host.TaskInventory.LockItemsForWrite(false);
3290 }
3291 3338
3292 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3339 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3293 m_waitingForScriptAnswer=true; 3340 m_waitingForScriptAnswer=true;
@@ -3322,10 +3369,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3322 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3369 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3323 llReleaseControls(); 3370 llReleaseControls();
3324 3371
3325 lock (m_host.TaskInventory) 3372
3326 { 3373 m_host.TaskInventory.LockItemsForWrite(true);
3327 m_host.TaskInventory[invItemID].PermsMask = answer; 3374 m_host.TaskInventory[invItemID].PermsMask = answer;
3328 } 3375 m_host.TaskInventory.LockItemsForWrite(false);
3376
3329 3377
3330 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3378 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3331 "run_time_permissions", new Object[] { 3379 "run_time_permissions", new Object[] {
@@ -3337,16 +3385,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3337 { 3385 {
3338 m_host.AddScriptLPS(1); 3386 m_host.AddScriptLPS(1);
3339 3387
3340 lock (m_host.TaskInventory) 3388 m_host.TaskInventory.LockItemsForRead(true);
3389
3390 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3341 { 3391 {
3342 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3392 if (item.Type == 10 && item.ItemID == m_itemID)
3343 { 3393 {
3344 if (item.Type == 10 && item.ItemID == m_itemID) 3394 m_host.TaskInventory.LockItemsForRead(false);
3345 { 3395 return item.PermsGranter.ToString();
3346 return item.PermsGranter.ToString();
3347 }
3348 } 3396 }
3349 } 3397 }
3398 m_host.TaskInventory.LockItemsForRead(false);
3350 3399
3351 return UUID.Zero.ToString(); 3400 return UUID.Zero.ToString();
3352 } 3401 }
@@ -3355,19 +3404,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3355 { 3404 {
3356 m_host.AddScriptLPS(1); 3405 m_host.AddScriptLPS(1);
3357 3406
3358 lock (m_host.TaskInventory) 3407 m_host.TaskInventory.LockItemsForRead(true);
3408
3409 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3359 { 3410 {
3360 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3411 if (item.Type == 10 && item.ItemID == m_itemID)
3361 { 3412 {
3362 if (item.Type == 10 && item.ItemID == m_itemID) 3413 int perms = item.PermsMask;
3363 { 3414 if (m_automaticLinkPermission)
3364 int perms = item.PermsMask; 3415 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3365 if (m_automaticLinkPermission) 3416 m_host.TaskInventory.LockItemsForRead(false);
3366 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3417 return perms;
3367 return perms;
3368 }
3369 } 3418 }
3370 } 3419 }
3420 m_host.TaskInventory.LockItemsForRead(false);
3371 3421
3372 return 0; 3422 return 0;
3373 } 3423 }
@@ -3400,11 +3450,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3400 UUID invItemID = InventorySelf(); 3450 UUID invItemID = InventorySelf();
3401 3451
3402 TaskInventoryItem item; 3452 TaskInventoryItem item;
3403 lock (m_host.TaskInventory) 3453 m_host.TaskInventory.LockItemsForRead(true);
3404 { 3454 item = m_host.TaskInventory[invItemID];
3405 item = m_host.TaskInventory[invItemID]; 3455 m_host.TaskInventory.LockItemsForRead(false);
3406 } 3456
3407
3408 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3457 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3409 && !m_automaticLinkPermission) 3458 && !m_automaticLinkPermission)
3410 { 3459 {
@@ -3457,16 +3506,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3457 m_host.AddScriptLPS(1); 3506 m_host.AddScriptLPS(1);
3458 UUID invItemID = InventorySelf(); 3507 UUID invItemID = InventorySelf();
3459 3508
3460 lock (m_host.TaskInventory) 3509 m_host.TaskInventory.LockItemsForRead(true);
3461 {
3462 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3510 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3463 && !m_automaticLinkPermission) 3511 && !m_automaticLinkPermission)
3464 { 3512 {
3465 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3513 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3514 m_host.TaskInventory.LockItemsForRead(false);
3466 return; 3515 return;
3467 } 3516 }
3468 } 3517 m_host.TaskInventory.LockItemsForRead(false);
3469 3518
3470 if (linknum < ScriptBaseClass.LINK_THIS) 3519 if (linknum < ScriptBaseClass.LINK_THIS)
3471 return; 3520 return;
3472 3521
@@ -3635,17 +3684,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3635 m_host.AddScriptLPS(1); 3684 m_host.AddScriptLPS(1);
3636 int count = 0; 3685 int count = 0;
3637 3686
3638 lock (m_host.TaskInventory) 3687 m_host.TaskInventory.LockItemsForRead(true);
3688 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3639 { 3689 {
3640 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 3690 if (inv.Value.Type == type || type == -1)
3641 { 3691 {
3642 if (inv.Value.Type == type || type == -1) 3692 count = count + 1;
3643 {
3644 count = count + 1;
3645 }
3646 } 3693 }
3647 } 3694 }
3648 3695
3696 m_host.TaskInventory.LockItemsForRead(false);
3649 return count; 3697 return count;
3650 } 3698 }
3651 3699
@@ -3654,16 +3702,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3654 m_host.AddScriptLPS(1); 3702 m_host.AddScriptLPS(1);
3655 ArrayList keys = new ArrayList(); 3703 ArrayList keys = new ArrayList();
3656 3704
3657 lock (m_host.TaskInventory) 3705 m_host.TaskInventory.LockItemsForRead(true);
3706 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3658 { 3707 {
3659 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 3708 if (inv.Value.Type == type || type == -1)
3660 { 3709 {
3661 if (inv.Value.Type == type || type == -1) 3710 keys.Add(inv.Value.Name);
3662 {
3663 keys.Add(inv.Value.Name);
3664 }
3665 } 3711 }
3666 } 3712 }
3713 m_host.TaskInventory.LockItemsForRead(false);
3667 3714
3668 if (keys.Count == 0) 3715 if (keys.Count == 0)
3669 { 3716 {
@@ -3700,20 +3747,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3700 } 3747 }
3701 3748
3702 // move the first object found with this inventory name 3749 // move the first object found with this inventory name
3703 lock (m_host.TaskInventory) 3750 m_host.TaskInventory.LockItemsForRead(true);
3751 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3704 { 3752 {
3705 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 3753 if (inv.Value.Name == inventory)
3706 { 3754 {
3707 if (inv.Value.Name == inventory) 3755 found = true;
3708 { 3756 objId = inv.Key;
3709 found = true; 3757 assetType = inv.Value.Type;
3710 objId = inv.Key; 3758 objName = inv.Value.Name;
3711 assetType = inv.Value.Type; 3759 break;
3712 objName = inv.Value.Name;
3713 break;
3714 }
3715 } 3760 }
3716 } 3761 }
3762 m_host.TaskInventory.LockItemsForRead(false);
3717 3763
3718 if (!found) 3764 if (!found)
3719 { 3765 {
@@ -3763,20 +3809,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3763 { 3809 {
3764 m_host.AddScriptLPS(1); 3810 m_host.AddScriptLPS(1);
3765 3811
3766 lock (m_host.TaskInventory) 3812 m_host.TaskInventory.LockItemsForRead(true);
3813 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3767 { 3814 {
3768 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3815 if (item.Name == name)
3769 { 3816 {
3770 if (item.Name == name) 3817 if (item.ItemID == m_itemID)
3771 { 3818 throw new ScriptDeleteException();
3772 if (item.ItemID == m_itemID) 3819 else
3773 throw new ScriptDeleteException(); 3820 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3774 else 3821
3775 m_host.Inventory.RemoveInventoryItem(item.ItemID); 3822 m_host.TaskInventory.LockItemsForRead(false);
3776 return; 3823 return;
3777 }
3778 } 3824 }
3779 } 3825 }
3826 m_host.TaskInventory.LockItemsForRead(false);
3780 } 3827 }
3781 3828
3782 public void llSetText(string text, LSL_Vector color, double alpha) 3829 public void llSetText(string text, LSL_Vector color, double alpha)
@@ -3865,6 +3912,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3865 { 3912 {
3866 m_host.AddScriptLPS(1); 3913 m_host.AddScriptLPS(1);
3867 3914
3915 //Clone is thread safe
3868 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 3916 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
3869 3917
3870 foreach (TaskInventoryItem item in itemDictionary.Values) 3918 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -3955,17 +4003,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3955 UUID soundId = UUID.Zero; 4003 UUID soundId = UUID.Zero;
3956 if (!UUID.TryParse(impact_sound, out soundId)) 4004 if (!UUID.TryParse(impact_sound, out soundId))
3957 { 4005 {
3958 lock (m_host.TaskInventory) 4006 m_host.TaskInventory.LockItemsForRead(true);
4007 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3959 { 4008 {
3960 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4009 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
3961 { 4010 {
3962 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4011 soundId = item.AssetID;
3963 { 4012 break;
3964 soundId = item.AssetID;
3965 break;
3966 }
3967 } 4013 }
3968 } 4014 }
4015 m_host.TaskInventory.LockItemsForRead(false);
3969 } 4016 }
3970 m_host.CollisionSound = soundId; 4017 m_host.CollisionSound = soundId;
3971 m_host.CollisionSoundVolume = (float)impact_volume; 4018 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4011,6 +4058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4011 UUID partItemID; 4058 UUID partItemID;
4012 foreach (SceneObjectPart part in parts) 4059 foreach (SceneObjectPart part in parts)
4013 { 4060 {
4061 //Clone is thread safe
4014 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4062 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4015 4063
4016 foreach (TaskInventoryItem item in itemsDictionary.Values) 4064 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4218,17 +4266,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4218 4266
4219 m_host.AddScriptLPS(1); 4267 m_host.AddScriptLPS(1);
4220 4268
4221 lock (m_host.TaskInventory) 4269 m_host.TaskInventory.LockItemsForRead(true);
4270 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4222 { 4271 {
4223 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4272 if (item.Type == 10 && item.ItemID == m_itemID)
4224 { 4273 {
4225 if (item.Type == 10 && item.ItemID == m_itemID) 4274 result = item.Name!=null?item.Name:String.Empty;
4226 { 4275 break;
4227 result = item.Name!=null?item.Name:String.Empty;
4228 break;
4229 }
4230 } 4276 }
4231 } 4277 }
4278 m_host.TaskInventory.LockItemsForRead(false);
4232 4279
4233 return result; 4280 return result;
4234 } 4281 }
@@ -4486,23 +4533,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4486 { 4533 {
4487 m_host.AddScriptLPS(1); 4534 m_host.AddScriptLPS(1);
4488 4535
4489 lock (m_host.TaskInventory) 4536 m_host.TaskInventory.LockItemsForRead(true);
4537 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4490 { 4538 {
4491 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4539 if (inv.Value.Name == name)
4492 { 4540 {
4493 if (inv.Value.Name == name) 4541 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4494 { 4542 {
4495 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 4543 m_host.TaskInventory.LockItemsForRead(false);
4496 { 4544 return inv.Value.AssetID.ToString();
4497 return inv.Value.AssetID.ToString(); 4545 }
4498 } 4546 else
4499 else 4547 {
4500 { 4548 m_host.TaskInventory.LockItemsForRead(false);
4501 return UUID.Zero.ToString(); 4549 return UUID.Zero.ToString();
4502 }
4503 } 4550 }
4504 } 4551 }
4505 } 4552 }
4553 m_host.TaskInventory.LockItemsForRead(false);
4506 4554
4507 return UUID.Zero.ToString(); 4555 return UUID.Zero.ToString();
4508 } 4556 }
@@ -5997,14 +6045,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5997 6045
5998 protected UUID GetTaskInventoryItem(string name) 6046 protected UUID GetTaskInventoryItem(string name)
5999 { 6047 {
6000 lock (m_host.TaskInventory) 6048 m_host.TaskInventory.LockItemsForRead(true);
6049 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6001 { 6050 {
6002 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6051 if (inv.Value.Name == name)
6003 { 6052 {
6004 if (inv.Value.Name == name) 6053 m_host.TaskInventory.LockItemsForRead(false);
6005 return inv.Key; 6054 return inv.Key;
6006 } 6055 }
6007 } 6056 }
6057 m_host.TaskInventory.LockItemsForRead(false);
6008 6058
6009 return UUID.Zero; 6059 return UUID.Zero;
6010 } 6060 }
@@ -6315,22 +6365,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6315 } 6365 }
6316 6366
6317 // copy the first script found with this inventory name 6367 // copy the first script found with this inventory name
6318 lock (m_host.TaskInventory) 6368 m_host.TaskInventory.LockItemsForRead(true);
6369 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6319 { 6370 {
6320 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6371 if (inv.Value.Name == name)
6321 { 6372 {
6322 if (inv.Value.Name == name) 6373 // make sure the object is a script
6374 if (10 == inv.Value.Type)
6323 { 6375 {
6324 // make sure the object is a script 6376 found = true;
6325 if (10 == inv.Value.Type) 6377 srcId = inv.Key;
6326 { 6378 break;
6327 found = true;
6328 srcId = inv.Key;
6329 break;
6330 }
6331 } 6379 }
6332 } 6380 }
6333 } 6381 }
6382 m_host.TaskInventory.LockItemsForRead(false);
6334 6383
6335 if (!found) 6384 if (!found)
6336 { 6385 {
@@ -8133,28 +8182,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8133 { 8182 {
8134 m_host.AddScriptLPS(1); 8183 m_host.AddScriptLPS(1);
8135 8184
8136 lock (m_host.TaskInventory) 8185 m_host.TaskInventory.LockItemsForRead(true);
8186 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8137 { 8187 {
8138 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8188 if (inv.Value.Name == item)
8139 { 8189 {
8140 if (inv.Value.Name == item) 8190 m_host.TaskInventory.LockItemsForRead(false);
8191 switch (mask)
8141 { 8192 {
8142 switch (mask) 8193 case 0:
8143 { 8194 return (int)inv.Value.BasePermissions;
8144 case 0: 8195 case 1:
8145 return (int)inv.Value.BasePermissions; 8196 return (int)inv.Value.CurrentPermissions;
8146 case 1: 8197 case 2:
8147 return (int)inv.Value.CurrentPermissions; 8198 return (int)inv.Value.GroupPermissions;
8148 case 2: 8199 case 3:
8149 return (int)inv.Value.GroupPermissions; 8200 return (int)inv.Value.EveryonePermissions;
8150 case 3: 8201 case 4:
8151 return (int)inv.Value.EveryonePermissions; 8202 return (int)inv.Value.NextPermissions;
8152 case 4:
8153 return (int)inv.Value.NextPermissions;
8154 }
8155 } 8203 }
8156 } 8204 }
8157 } 8205 }
8206 m_host.TaskInventory.LockItemsForRead(false);
8158 8207
8159 return -1; 8208 return -1;
8160 } 8209 }
@@ -8169,16 +8218,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8169 { 8218 {
8170 m_host.AddScriptLPS(1); 8219 m_host.AddScriptLPS(1);
8171 8220
8172 lock (m_host.TaskInventory) 8221 m_host.TaskInventory.LockItemsForRead(true);
8222 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8173 { 8223 {
8174 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8224 if (inv.Value.Name == item)
8175 { 8225 {
8176 if (inv.Value.Name == item) 8226 m_host.TaskInventory.LockItemsForRead(false);
8177 { 8227 return inv.Value.CreatorID.ToString();
8178 return inv.Value.CreatorID.ToString();
8179 }
8180 } 8228 }
8181 } 8229 }
8230 m_host.TaskInventory.LockItemsForRead(false);
8182 8231
8183 llSay(0, "No item name '" + item + "'"); 8232 llSay(0, "No item name '" + item + "'");
8184 8233
@@ -8702,16 +8751,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8702 { 8751 {
8703 m_host.AddScriptLPS(1); 8752 m_host.AddScriptLPS(1);
8704 8753
8705 lock (m_host.TaskInventory) 8754 m_host.TaskInventory.LockItemsForRead(true);
8755 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8706 { 8756 {
8707 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8757 if (inv.Value.Name == name)
8708 { 8758 {
8709 if (inv.Value.Name == name) 8759 m_host.TaskInventory.LockItemsForRead(false);
8710 { 8760 return inv.Value.Type;
8711 return inv.Value.Type;
8712 }
8713 } 8761 }
8714 } 8762 }
8763 m_host.TaskInventory.LockItemsForRead(false);
8715 8764
8716 return -1; 8765 return -1;
8717 } 8766 }
@@ -8742,17 +8791,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8742 if (invItemID == UUID.Zero) 8791 if (invItemID == UUID.Zero)
8743 return new LSL_Vector(); 8792 return new LSL_Vector();
8744 8793
8745 lock (m_host.TaskInventory) 8794 m_host.TaskInventory.LockItemsForRead(true);
8795 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
8746 { 8796 {
8747 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 8797 m_host.TaskInventory.LockItemsForRead(false);
8748 return new LSL_Vector(); 8798 return new LSL_Vector();
8799 }
8749 8800
8750 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 8801 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
8751 { 8802 {
8752 ShoutError("No permissions to track the camera"); 8803 ShoutError("No permissions to track the camera");
8753 return new LSL_Vector(); 8804 m_host.TaskInventory.LockItemsForRead(false);
8754 } 8805 return new LSL_Vector();
8755 } 8806 }
8807 m_host.TaskInventory.LockItemsForRead(false);
8756 8808
8757 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 8809 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
8758 if (presence != null) 8810 if (presence != null)
@@ -8770,17 +8822,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8770 if (invItemID == UUID.Zero) 8822 if (invItemID == UUID.Zero)
8771 return new LSL_Rotation(); 8823 return new LSL_Rotation();
8772 8824
8773 lock (m_host.TaskInventory) 8825 m_host.TaskInventory.LockItemsForRead(true);
8826 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
8774 { 8827 {
8775 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 8828 m_host.TaskInventory.LockItemsForRead(false);
8776 return new LSL_Rotation(); 8829 return new LSL_Rotation();
8777
8778 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
8779 {
8780 ShoutError("No permissions to track the camera");
8781 return new LSL_Rotation();
8782 }
8783 } 8830 }
8831 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
8832 {
8833 ShoutError("No permissions to track the camera");
8834 m_host.TaskInventory.LockItemsForRead(false);
8835 return new LSL_Rotation();
8836 }
8837 m_host.TaskInventory.LockItemsForRead(false);
8784 8838
8785 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 8839 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
8786 if (presence != null) 8840 if (presence != null)
@@ -8930,14 +8984,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8930 if (objectID == UUID.Zero) return; 8984 if (objectID == UUID.Zero) return;
8931 8985
8932 UUID agentID; 8986 UUID agentID;
8933 lock (m_host.TaskInventory) 8987 m_host.TaskInventory.LockItemsForRead(true);
8934 { 8988 // we need the permission first, to know which avatar we want to set the camera for
8935 // we need the permission first, to know which avatar we want to set the camera for 8989 agentID = m_host.TaskInventory[invItemID].PermsGranter;
8936 agentID = m_host.TaskInventory[invItemID].PermsGranter;
8937 8990
8938 if (agentID == UUID.Zero) return; 8991 if (agentID == UUID.Zero)
8939 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 8992 {
8993 m_host.TaskInventory.LockItemsForRead(false);
8994 return;
8995 }
8996 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
8997 {
8998 m_host.TaskInventory.LockItemsForRead(false);
8999 return;
8940 } 9000 }
9001 m_host.TaskInventory.LockItemsForRead(false);
8941 9002
8942 ScenePresence presence = World.GetScenePresence(agentID); 9003 ScenePresence presence = World.GetScenePresence(agentID);
8943 9004
@@ -8987,12 +9048,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8987 9048
8988 // we need the permission first, to know which avatar we want to clear the camera for 9049 // we need the permission first, to know which avatar we want to clear the camera for
8989 UUID agentID; 9050 UUID agentID;
8990 lock (m_host.TaskInventory) 9051 m_host.TaskInventory.LockItemsForRead(true);
9052 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9053 if (agentID == UUID.Zero)
8991 { 9054 {
8992 agentID = m_host.TaskInventory[invItemID].PermsGranter; 9055 m_host.TaskInventory.LockItemsForRead(false);
8993 if (agentID == UUID.Zero) return; 9056 return;
8994 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
8995 } 9057 }
9058 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
9059 {
9060 m_host.TaskInventory.LockItemsForRead(false);
9061 return;
9062 }
9063 m_host.TaskInventory.LockItemsForRead(false);
8996 9064
8997 ScenePresence presence = World.GetScenePresence(agentID); 9065 ScenePresence presence = World.GetScenePresence(agentID);
8998 9066
@@ -9449,15 +9517,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9449 9517
9450 internal UUID ScriptByName(string name) 9518 internal UUID ScriptByName(string name)
9451 { 9519 {
9452 lock (m_host.TaskInventory) 9520 m_host.TaskInventory.LockItemsForRead(true);
9521
9522 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
9453 { 9523 {
9454 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 9524 if (item.Type == 10 && item.Name == name)
9455 { 9525 {
9456 if (item.Type == 10 && item.Name == name) 9526 m_host.TaskInventory.LockItemsForRead(false);
9457 return item.ItemID; 9527 return item.ItemID;
9458 } 9528 }
9459 } 9529 }
9460 9530
9531 m_host.TaskInventory.LockItemsForRead(false);
9532
9461 return UUID.Zero; 9533 return UUID.Zero;
9462 } 9534 }
9463 9535
@@ -9498,6 +9570,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9498 { 9570 {
9499 m_host.AddScriptLPS(1); 9571 m_host.AddScriptLPS(1);
9500 9572
9573 //Clone is thread safe
9501 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 9574 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
9502 9575
9503 UUID assetID = UUID.Zero; 9576 UUID assetID = UUID.Zero;
@@ -9560,6 +9633,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9560 { 9633 {
9561 m_host.AddScriptLPS(1); 9634 m_host.AddScriptLPS(1);
9562 9635
9636 //Clone is thread safe
9563 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 9637 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
9564 9638
9565 UUID assetID = UUID.Zero; 9639 UUID assetID = UUID.Zero;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7fdbac8..83322eb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -728,18 +728,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
728 if (target != null) 728 if (target != null)
729 { 729 {
730 UUID animID=UUID.Zero; 730 UUID animID=UUID.Zero;
731 lock (m_host.TaskInventory) 731 m_host.TaskInventory.LockItemsForRead(true);
732 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
732 { 733 {
733 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 734 if (inv.Value.Name == animation)
734 { 735 {
735 if (inv.Value.Name == animation) 736 if (inv.Value.Type == (int)AssetType.Animation)
736 { 737 animID = inv.Value.AssetID;
737 if (inv.Value.Type == (int)AssetType.Animation) 738 continue;
738 animID = inv.Value.AssetID;
739 continue;
740 }
741 } 739 }
742 } 740 }
741 m_host.TaskInventory.LockItemsForRead(false);
743 if (animID == UUID.Zero) 742 if (animID == UUID.Zero)
744 target.Animator.AddAnimation(animation, m_host.UUID); 743 target.Animator.AddAnimation(animation, m_host.UUID);
745 else 744 else
@@ -761,18 +760,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
761 if (target != null) 760 if (target != null)
762 { 761 {
763 UUID animID=UUID.Zero; 762 UUID animID=UUID.Zero;
764 lock (m_host.TaskInventory) 763 m_host.TaskInventory.LockItemsForRead(true);
764 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
765 { 765 {
766 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 766 if (inv.Value.Name == animation)
767 { 767 {
768 if (inv.Value.Name == animation) 768 if (inv.Value.Type == (int)AssetType.Animation)
769 { 769 animID = inv.Value.AssetID;
770 if (inv.Value.Type == (int)AssetType.Animation) 770 continue;
771 animID = inv.Value.AssetID;
772 continue;
773 }
774 } 771 }
775 } 772 }
773 m_host.TaskInventory.LockItemsForRead(false);
776 774
777 if (animID == UUID.Zero) 775 if (animID == UUID.Zero)
778 target.Animator.RemoveAnimation(animation); 776 target.Animator.RemoveAnimation(animation);
@@ -1541,6 +1539,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1541 1539
1542 if (!UUID.TryParse(name, out assetID)) 1540 if (!UUID.TryParse(name, out assetID))
1543 { 1541 {
1542 m_host.TaskInventory.LockItemsForRead(true);
1544 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1543 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1545 { 1544 {
1546 if (item.Type == 7 && item.Name == name) 1545 if (item.Type == 7 && item.Name == name)
@@ -1548,6 +1547,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1548 assetID = item.AssetID; 1547 assetID = item.AssetID;
1549 } 1548 }
1550 } 1549 }
1550 m_host.TaskInventory.LockItemsForRead(false);
1551 } 1551 }
1552 1552
1553 if (assetID == UUID.Zero) 1553 if (assetID == UUID.Zero)
@@ -1594,6 +1594,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1594 1594
1595 if (!UUID.TryParse(name, out assetID)) 1595 if (!UUID.TryParse(name, out assetID))
1596 { 1596 {
1597 m_host.TaskInventory.LockItemsForRead(true);
1597 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1598 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1598 { 1599 {
1599 if (item.Type == 7 && item.Name == name) 1600 if (item.Type == 7 && item.Name == name)
@@ -1601,6 +1602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1601 assetID = item.AssetID; 1602 assetID = item.AssetID;
1602 } 1603 }
1603 } 1604 }
1605 m_host.TaskInventory.LockItemsForRead(false);
1604 } 1606 }
1605 1607
1606 if (assetID == UUID.Zero) 1608 if (assetID == UUID.Zero)
@@ -1651,6 +1653,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1651 1653
1652 if (!UUID.TryParse(name, out assetID)) 1654 if (!UUID.TryParse(name, out assetID))
1653 { 1655 {
1656 m_host.TaskInventory.LockItemsForRead(true);
1654 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1657 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1655 { 1658 {
1656 if (item.Type == 7 && item.Name == name) 1659 if (item.Type == 7 && item.Name == name)
@@ -1658,6 +1661,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1658 assetID = item.AssetID; 1661 assetID = item.AssetID;
1659 } 1662 }
1660 } 1663 }
1664 m_host.TaskInventory.LockItemsForRead(false);
1661 } 1665 }
1662 1666
1663 if (assetID == UUID.Zero) 1667 if (assetID == UUID.Zero)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 063d50f..0f4a9ad 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -238,13 +238,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
238 238
239 if (part != null) 239 if (part != null)
240 { 240 {
241 lock (part.TaskInventory) 241 part.TaskInventory.LockItemsForRead(true);
242 if (part.TaskInventory.ContainsKey(m_ItemID))
242 { 243 {
243 if (part.TaskInventory.ContainsKey(m_ItemID)) 244 m_thisScriptTask = part.TaskInventory[m_ItemID];
244 {
245 m_thisScriptTask = part.TaskInventory[m_ItemID];
246 }
247 } 245 }
246 part.TaskInventory.LockItemsForRead(false);
248 } 247 }
249 248
250 ApiManager am = new ApiManager(); 249 ApiManager am = new ApiManager();
@@ -429,14 +428,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
429 { 428 {
430 int permsMask; 429 int permsMask;
431 UUID permsGranter; 430 UUID permsGranter;
432 lock (part.TaskInventory) 431 part.TaskInventory.LockItemsForRead(true);
432 if (!part.TaskInventory.ContainsKey(m_ItemID))
433 { 433 {
434 if (!part.TaskInventory.ContainsKey(m_ItemID)) 434 part.TaskInventory.LockItemsForRead(false);
435 return; 435 return;
436
437 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
438 permsMask = part.TaskInventory[m_ItemID].PermsMask;
439 } 436 }
437 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
438 permsMask = part.TaskInventory[m_ItemID].PermsMask;
439 part.TaskInventory.LockItemsForRead(false);
440 440
441 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 441 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
442 { 442 {
generated by cgit v1.1 at 2024-11-14 16:04:14 +0000