diff options
author | Melanie | 2010-06-13 03:56:47 +0100 |
---|---|---|
committer | Melanie | 2010-06-13 03:56:47 +0100 |
commit | deaf6bff985aa4a408575cc89e70366ccb79a723 (patch) | |
tree | a76e5365ff31edd14af54eeaa7c18fe33b7622e8 /OpenSim/Region/ScriptEngine | |
parent | Change flavor to 0.7-RC1 (diff) | |
parent | Added Old Guids=true to all MySql connection strings. (diff) | |
download | opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.zip opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.gz opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.bz2 opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
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 5400a4f..59ab26b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2699,6 +2699,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2699 | // objects rezzed with this method are die_at_edge by default. | 2699 | // objects rezzed with this method are die_at_edge by default. |
2700 | new_group.RootPart.SetDieAtEdge(true); | 2700 | new_group.RootPart.SetDieAtEdge(true); |
2701 | 2701 | ||
2702 | new_group.ResumeScripts(); | ||
2703 | |||
2702 | m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams( | 2704 | m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams( |
2703 | "object_rez", new Object[] { | 2705 | "object_rez", new Object[] { |
2704 | new LSL_String( | 2706 | new LSL_String( |