aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-06-12 06:14:10 +0100
committerMelanie2010-06-12 06:14:10 +0100
commit0ece71f8d19de6051d251d662c193a5eb77e9c2a (patch)
tree1bcf8cef1b489acded5b782d9df749631e8341cd /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentResume scripts that have been rezzed from a prim (diff)
downloadopensim-SC_OLD-0ece71f8d19de6051d251d662c193a5eb77e9c2a.zip
opensim-SC_OLD-0ece71f8d19de6051d251d662c193a5eb77e9c2a.tar.gz
opensim-SC_OLD-0ece71f8d19de6051d251d662c193a5eb77e9c2a.tar.bz2
opensim-SC_OLD-0ece71f8d19de6051d251d662c193a5eb77e9c2a.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0a4544c..9f3e354 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2862,6 +2862,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2862 // objects rezzed with this method are die_at_edge by default. 2862 // objects rezzed with this method are die_at_edge by default.
2863 new_group.RootPart.SetDieAtEdge(true); 2863 new_group.RootPart.SetDieAtEdge(true);
2864 2864
2865 new_group.ResumeScripts();
2866
2865 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams( 2867 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
2866 "object_rez", new Object[] { 2868 "object_rez", new Object[] {
2867 new LSL_String( 2869 new LSL_String(