aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorDr Scofield2008-11-14 13:03:18 +0000
committerDr Scofield2008-11-14 13:03:18 +0000
commit5c21ec6d108313080ccf8bdf2212ce52ad80bbb5 (patch)
tree8d039bfe8603ce2c049a8f26f44fa121ab372afe /OpenSim/Region/ScriptEngine
parentFrom: Christopher Yeoh <cyeoh@au1.ibm.com> (diff)
downloadopensim-SC_OLD-5c21ec6d108313080ccf8bdf2212ce52ad80bbb5.zip
opensim-SC_OLD-5c21ec6d108313080ccf8bdf2212ce52ad80bbb5.tar.gz
opensim-SC_OLD-5c21ec6d108313080ccf8bdf2212ce52ad80bbb5.tar.bz2
opensim-SC_OLD-5c21ec6d108313080ccf8bdf2212ce52ad80bbb5.tar.xz
reverting #7295, as it still fails a test case (as pointed out very
kindly by sean) --- lesson learned: just running a "make test" is not sufficient, you need to precede it by a "make clean".
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
2 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c1d718e..ab7b710 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4006,9 +4006,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4006 m_host.ParentGroup.RootPart.AllowedDrop = true; 4006 m_host.ParentGroup.RootPart.AllowedDrop = true;
4007 else 4007 else
4008 m_host.ParentGroup.RootPart.AllowedDrop = false; 4008 m_host.ParentGroup.RootPart.AllowedDrop = false;
4009
4010 // Update the object flags
4011 m_host.ParentGroup.RootPart.aggregateScriptEvents();
4012 } 4009 }
4013 4010
4014 public LSL_Vector llGetSunDirection() 4011 public LSL_Vector llGetSunDirection()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8cac070..f9302e9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1014,7 +1014,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1014 taskItem.PermsMask = 0; 1014 taskItem.PermsMask = 0;
1015 taskItem.AssetID = asset.FullID; 1015 taskItem.AssetID = asset.FullID;
1016 1016
1017 m_host.AddInventoryItem(taskItem, false); 1017 m_host.AddInventoryItem(taskItem);
1018 } 1018 }
1019 } 1019 }
1020} 1020}