aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs69
1 files changed, 30 insertions, 39 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 62c3436..a27432d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -147,10 +147,10 @@ namespace OpenSim.Region.Environment.Scenes
147 /// <returns></returns> 147 /// <returns></returns>
148 public void StartScript(TaskInventoryItem item) 148 public void StartScript(TaskInventoryItem item)
149 { 149 {
150// m_log.Info(String.Format( 150// m_log.InfoFormat(
151// "[PRIMINVENTORY]: " + 151// "[PRIMINVENTORY]: " +
152// "Starting script {0}, {1} in prim {2}, {3}", 152// "Starting script {0}, {1} in prim {2}, {3}",
153// item.Name, item.ItemID, Name, UUID)); 153// item.Name, item.ItemID, Name, UUID);
154 AddFlag(LLObject.ObjectFlags.Scripted); 154 AddFlag(LLObject.ObjectFlags.Scripted);
155 155
156 if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts)) 156 if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts))
@@ -166,10 +166,10 @@ namespace OpenSim.Region.Environment.Scenes
166 } 166 }
167 else 167 else
168 { 168 {
169 m_log.Error(String.Format( 169 m_log.ErrorFormat(
170 "[PRIMINVENTORY]: " + 170 "[PRIMINVENTORY]: " +
171 "Couldn't start script {0}, {1} since asset ID {2} could not be found", 171 "Couldn't start script {0}, {1} since asset ID {2} could not be found",
172 item.Name, item.ItemID, item.AssetID)); 172 item.Name, item.ItemID, item.AssetID);
173 } 173 }
174 } 174 }
175 ScheduleFullUpdate(); 175 ScheduleFullUpdate();
@@ -192,10 +192,10 @@ namespace OpenSim.Region.Environment.Scenes
192 } 192 }
193 else 193 else
194 { 194 {
195 m_log.Error(String.Format( 195 m_log.ErrorFormat(
196 "[PRIMINVENTORY]: " + 196 "[PRIMINVENTORY]: " +
197 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}", 197 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}",
198 itemId, Name, UUID)); 198 itemId, Name, UUID);
199 } 199 }
200 } 200 }
201 } 201 }
@@ -206,27 +206,18 @@ namespace OpenSim.Region.Environment.Scenes
206 /// <param name="itemId"></param> 206 /// <param name="itemId"></param>
207 public void StopScript(LLUUID itemId) 207 public void StopScript(LLUUID itemId)
208 { 208 {
209
210
211 if (m_taskInventory.ContainsKey(itemId)) 209 if (m_taskInventory.ContainsKey(itemId))
212 { 210 {
213
214 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId); 211 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId);
215 m_parentGroup.AddActiveScriptCount(-1); 212 m_parentGroup.AddActiveScriptCount(-1);
216
217
218
219
220
221 } 213 }
222 else 214 else
223 { 215 {
224 m_log.Error(String.Format( 216 m_log.ErrorFormat(
225 "[PRIMINVENTORY]: " + 217 "[PRIMINVENTORY]: " +
226 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}", 218 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}",
227 itemId, Name, UUID)); 219 itemId, Name, UUID);
228 } 220 }
229
230 } 221 }
231 222
232 /// <summary> 223 /// <summary>
@@ -285,10 +276,10 @@ namespace OpenSim.Region.Environment.Scenes
285 } 276 }
286 else 277 else
287 { 278 {
288 m_log.Error(String.Format( 279 m_log.ErrorFormat(
289 "[PRIMINVENTORY]: " + 280 "[PRIMINVENTORY]: " +
290 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 281 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
291 itemID, Name, UUID)); 282 itemID, Name, UUID);
292 } 283 }
293 } 284 }
294 285
@@ -317,10 +308,10 @@ namespace OpenSim.Region.Environment.Scenes
317 } 308 }
318 else 309 else
319 { 310 {
320 m_log.Error(String.Format( 311 m_log.ErrorFormat(
321 "[PRIMINVENTORY]: " + 312 "[PRIMINVENTORY]: " +
322 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 313 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
323 item.ItemID, Name, UUID)); 314 item.ItemID, Name, UUID);
324 } 315 }
325 } 316 }
326 317
@@ -374,10 +365,10 @@ namespace OpenSim.Region.Environment.Scenes
374 } 365 }
375 else 366 else
376 { 367 {
377 m_log.Error(String.Format( 368 m_log.ErrorFormat(
378 "[PRIMINVENTORY]: " + 369 "[PRIMINVENTORY]: " +
379 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 370 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
380 itemID, Name, UUID)); 371 itemID, Name, UUID);
381 } 372 }
382 } 373 }
383 374
@@ -442,8 +433,8 @@ namespace OpenSim.Region.Environment.Scenes
442 433
443 fileData = Helpers.StringToField(invString.BuildString); 434 fileData = Helpers.StringToField(invString.BuildString);
444 435
445// m_log.Info(String.Format( 436// m_log.InfoFormat(
446// "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData))); 437// "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData));
447 438
448 if (fileData.Length > 2) 439 if (fileData.Length > 2)
449 { 440 {