diff options
author | Melanie | 2012-07-17 01:42:42 +0200 |
---|---|---|
committer | Melanie | 2012-07-17 01:42:42 +0200 |
commit | 130668057fef7512a4caa162f02c407bad819ed9 (patch) | |
tree | afebea2680b236a59845a9760708a26369a2a136 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.zip opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.tar.gz opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.tar.bz2 opensim-SC_OLD-130668057fef7512a4caa162f02c407bad819ed9.tar.xz |
Fix merge artefacts
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 1c9a17e..e010864 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -355,6 +355,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
355 | AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); | 355 | AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); |
356 | if (null == asset) | 356 | if (null == asset) |
357 | { | 357 | { |
358 | string msg = String.Format("asset ID {0} could not be found", item.AssetID); | ||
359 | StoreScriptError(item.ItemID, msg); | ||
358 | m_log.ErrorFormat( | 360 | m_log.ErrorFormat( |
359 | "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", | 361 | "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", |
360 | item.Name, item.ItemID, m_part.AbsolutePosition, | 362 | item.Name, item.ItemID, m_part.AbsolutePosition, |
@@ -367,13 +369,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
367 | if (m_part.ParentGroup.m_savedScriptState != null) | 369 | if (m_part.ParentGroup.m_savedScriptState != null) |
368 | item.OldItemID = RestoreSavedScriptState(item.LoadedItemID, item.OldItemID, item.ItemID); | 370 | item.OldItemID = RestoreSavedScriptState(item.LoadedItemID, item.OldItemID, item.ItemID); |
369 | 371 | ||
370 | string msg = String.Format("asset ID {0} could not be found", item.AssetID); | ||
371 | StoreScriptError(item.ItemID, msg); | ||
372 | m_log.ErrorFormat( | ||
373 | "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", | ||
374 | item.Name, item.ItemID, m_part.AbsolutePosition, | ||
375 | m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID); | ||
376 | |||
377 | m_items.LockItemsForWrite(true); | 372 | m_items.LockItemsForWrite(true); |
378 | 373 | ||
379 | m_items[item.ItemID].OldItemID = item.OldItemID; | 374 | m_items[item.ItemID].OldItemID = item.OldItemID; |