aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-01 00:17:23 +0100
committerJustin Clark-Casey (justincc)2010-09-01 00:17:23 +0100
commitc947a67b23dceb7a970efca2097fc84003f94f8f (patch)
tree96b527979160aadf87b29a5255d55db81d524e0f /OpenSim/Region/CoreModules
parentrefactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rath... (diff)
parentAdjust the "Magic numbers" we use because we can't reference the actual (diff)
downloadopensim-SC_OLD-c947a67b23dceb7a970efca2097fc84003f94f8f.zip
opensim-SC_OLD-c947a67b23dceb7a970efca2097fc84003f94f8f.tar.gz
opensim-SC_OLD-c947a67b23dceb7a970efca2097fc84003f94f8f.tar.bz2
opensim-SC_OLD-c947a67b23dceb7a970efca2097fc84003f94f8f.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 6decf54..2ac2324 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -641,7 +641,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
641 } 641 }
642 642
643 // Fire on_rez 643 // Fire on_rez
644 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 0); 644 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
645 rootPart.ParentGroup.ResumeScripts(); 645 rootPart.ParentGroup.ResumeScripts();
646 646
647 rootPart.ScheduleFullUpdate(); 647 rootPart.ScheduleFullUpdate();