diff options
author | Melanie | 2012-02-07 21:09:04 +0000 |
---|---|---|
committer | Melanie | 2012-02-07 21:09:04 +0000 |
commit | 37049180f62d9b284c3ef1892cbf384774f6a2e3 (patch) | |
tree | 6f4a73fdfed2c7750cae6f8691a74ef5a0a8745b /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add TestAddTaskInventoryItem() (diff) | |
download | opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.zip opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.tar.gz opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.tar.bz2 opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index dc64281..ca85d10 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -326,10 +326,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
326 | /// <returns></returns> | 326 | /// <returns></returns> |
327 | public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez, string engine, int stateSource) | 327 | public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez, string engine, int stateSource) |
328 | { | 328 | { |
329 | // m_log.InfoFormat( | 329 | // m_log.DebugFormat("[PRIM INVENTORY]: Starting script {0} {1} in prim {2} {3} in {4}", |
330 | // "[PRIM INVENTORY]: " + | 330 | // item.Name, item.ItemID, m_part.Name, m_part.UUID, m_part.ParentGroup.Scene.RegionInfo.RegionName); |
331 | // "Starting script {0}, {1} in prim {2}, {3}", | ||
332 | // item.Name, item.ItemID, Name, UUID); | ||
333 | 331 | ||
334 | if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID)) | 332 | if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID)) |
335 | { | 333 | { |
@@ -362,8 +360,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
362 | string msg = String.Format("asset ID {0} could not be found", item.AssetID); | 360 | string msg = String.Format("asset ID {0} could not be found", item.AssetID); |
363 | StoreScriptError(item.ItemID, msg); | 361 | StoreScriptError(item.ItemID, msg); |
364 | m_log.ErrorFormat( | 362 | m_log.ErrorFormat( |
365 | "[PRIM INVENTORY]: " + | 363 | "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", |
366 | "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", | ||
367 | item.Name, item.ItemID, m_part.AbsolutePosition, | 364 | item.Name, item.ItemID, m_part.AbsolutePosition, |
368 | m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID); | 365 | m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID); |
369 | } | 366 | } |
@@ -499,8 +496,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
499 | string msg = String.Format("couldn't be found for prim {0}, {1}", m_part.Name, m_part.UUID); | 496 | string msg = String.Format("couldn't be found for prim {0}, {1}", m_part.Name, m_part.UUID); |
500 | StoreScriptError(itemId, msg); | 497 | StoreScriptError(itemId, msg); |
501 | m_log.ErrorFormat( | 498 | m_log.ErrorFormat( |
502 | "[PRIM INVENTORY]: " + | 499 | "[PRIM INVENTORY]: Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}", |
503 | "Couldn't start script with ID {0} since it {1}", itemId, msg); | 500 | itemId, m_part.Name, m_part.UUID, |
501 | m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); | ||
504 | } | 502 | } |
505 | 503 | ||
506 | } | 504 | } |