aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-06-24 03:35:42 +0100
committerMelanie2010-06-24 03:35:42 +0100
commite94cf3d9b71206384d33b4cc02fb252dfc93aed7 (patch)
tree7471ad904e252ea1787d366160e4d5fef0e8ef69
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-e94cf3d9b71206384d33b4cc02fb252dfc93aed7.zip
opensim-SC-e94cf3d9b71206384d33b4cc02fb252dfc93aed7.tar.gz
opensim-SC-e94cf3d9b71206384d33b4cc02fb252dfc93aed7.tar.bz2
opensim-SC-e94cf3d9b71206384d33b4cc02fb252dfc93aed7.tar.xz
And another conflict
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs17
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 5be71df..2cde8f3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -310,7 +310,6 @@ namespace OpenSim.Region.Framework.Scenes
310 } 310 }
311 else 311 else
312 { 312 {
313<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
314 if (m_part.ParentGroup.m_savedScriptState != null) 313 if (m_part.ParentGroup.m_savedScriptState != null)
315 RestoreSavedScriptState(item.OldItemID, item.ItemID); 314 RestoreSavedScriptState(item.OldItemID, item.ItemID);
316 315
@@ -327,22 +326,6 @@ namespace OpenSim.Region.Framework.Scenes
327 StoreScriptErrors(item.ItemID, null); 326 StoreScriptErrors(item.ItemID, null);
328 m_part.ParentGroup.AddActiveScriptCount(1); 327 m_part.ParentGroup.AddActiveScriptCount(1);
329 m_part.ScheduleFullUpdate(); 328 m_part.ScheduleFullUpdate();
330=======
331 lock (m_items)
332 {
333 if (m_part.ParentGroup.m_savedScriptState != null)
334 RestoreSavedScriptState(item.OldItemID, item.ItemID);
335
336 m_items[item.ItemID].PermsMask = 0;
337 m_items[item.ItemID].PermsGranter = UUID.Zero;
338
339 string script = Utils.BytesToString(asset.Data);
340 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
341 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
342 m_part.ParentGroup.AddActiveScriptCount(1);
343 m_part.ScheduleFullUpdate();
344 }
345>>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
346 } 329 }
347 } 330 }
348 } 331 }