aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorTalun2013-06-13 22:57:09 +0100
committerJustin Clark-Casey (justincc)2013-06-15 00:00:00 +0100
commitfc89bde044bf5805af9a5fe79d6e29e665e133ef (patch)
tree8bc518e879dd1fbbcf78d89c8f49321208532b35 /OpenSim/Region/ScriptEngine/Shared
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-fc89bde044bf5805af9a5fe79d6e29e665e133ef.zip
opensim-SC_OLD-fc89bde044bf5805af9a5fe79d6e29e665e133ef.tar.gz
opensim-SC_OLD-fc89bde044bf5805af9a5fe79d6e29e665e133ef.tar.bz2
opensim-SC_OLD-fc89bde044bf5805af9a5fe79d6e29e665e133ef.tar.xz
Mantis 6108: ossetprimitiveparams temporary/phantom problem
Corrected to ensure that the target prim is updated by osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM instead of the prim that the script is in.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 2 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 e1630b3..d2e9f6c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7725,7 +7725,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7725 return null; 7725 return null;
7726 7726
7727 string ph = rules.Data[idx++].ToString(); 7727 string ph = rules.Data[idx++].ToString();
7728 m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1")); 7728 part.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
7729 7729
7730 break; 7730 break;
7731 7731
@@ -7764,7 +7764,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7764 return null; 7764 return null;
7765 string temp = rules.Data[idx++].ToString(); 7765 string temp = rules.Data[idx++].ToString();
7766 7766
7767 m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1")); 7767 part.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
7768 7768
7769 break; 7769 break;
7770 7770