diff options
author | Melanie Thielker | 2008-09-18 15:24:16 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-18 15:24:16 +0000 |
commit | 23c217dd7b7fe53e5640854183c53da8dd0b25b1 (patch) | |
tree | bd316d982b7e0779b768de8f57409b48abd69eb6 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Mantis #2213 (diff) | |
download | opensim-SC_OLD-23c217dd7b7fe53e5640854183c53da8dd0b25b1.zip opensim-SC_OLD-23c217dd7b7fe53e5640854183c53da8dd0b25b1.tar.gz opensim-SC_OLD-23c217dd7b7fe53e5640854183c53da8dd0b25b1.tar.bz2 opensim-SC_OLD-23c217dd7b7fe53e5640854183c53da8dd0b25b1.tar.xz |
Kan-Ed fix series.
Correct a condition where a prim is linked before it has been persisted
for the first time and is then persisted through it's former SOG with
a bad offset position.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index b4369df..3295a96 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2812,10 +2812,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2812 | parentPrim = targetPart.ParentGroup; | 2812 | parentPrim = targetPart.ParentGroup; |
2813 | childPrim = m_host.ParentGroup; | 2813 | childPrim = m_host.ParentGroup; |
2814 | } | 2814 | } |
2815 | byte uf = childPrim.RootPart.UpdateFlag; | 2815 | // byte uf = childPrim.RootPart.UpdateFlag; |
2816 | childPrim.RootPart.UpdateFlag = 0; | 2816 | childPrim.RootPart.UpdateFlag = 0; |
2817 | parentPrim.LinkToGroup(childPrim); | 2817 | parentPrim.LinkToGroup(childPrim); |
2818 | childPrim.RootPart.UpdateFlag = uf; | 2818 | // if(uf != (Byte)0) |
2819 | // parent.RootPart.UpdateFlag = uf; | ||
2819 | } | 2820 | } |
2820 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); | 2821 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); |
2821 | parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); | 2822 | parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); |