aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2009-12-31 06:41:10 +0000
committerMelanie2009-12-31 06:41:10 +0000
commit9c4e6f060ad40fdc20b6b80a0e282f97e85fae75 (patch)
tree70ccf2c7f623f6fab5509c63b563213a04787a0a /OpenSim/Region/ScriptEngine/Shared
parent[PATCH] Adds llCollisionFilter (diff)
downloadopensim-SC_OLD-9c4e6f060ad40fdc20b6b80a0e282f97e85fae75.zip
opensim-SC_OLD-9c4e6f060ad40fdc20b6b80a0e282f97e85fae75.tar.gz
opensim-SC_OLD-9c4e6f060ad40fdc20b6b80a0e282f97e85fae75.tar.bz2
opensim-SC_OLD-9c4e6f060ad40fdc20b6b80a0e282f97e85fae75.tar.xz
This patch caused serialization errors and needs to be reexamined
Revert "[PATCH] Adds llCollisionFilter" This reverts commit eab2b4c6a96cd5b2a0f079f27a9c2ac15273d3f0.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs48
1 files changed, 4 insertions, 44 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 43df4ab..6102504 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2752,15 +2752,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2752 public void llCollisionFilter(string name, string id, int accept) 2752 public void llCollisionFilter(string name, string id, int accept)
2753 { 2753 {
2754 m_host.AddScriptLPS(1); 2754 m_host.AddScriptLPS(1);
2755 m_host.CollisionFilter.Clear(); 2755 NotImplemented("llCollisionFilter");
2756 if(id != null)
2757 {
2758 m_host.CollisionFilter.Add(accept,id);
2759 }
2760 else
2761 {
2762 m_host.CollisionFilter.Add(accept,name);
2763 }
2764 } 2756 }
2765 2757
2766 public void llTakeControls(int controls, int accept, int pass_on) 2758 public void llTakeControls(int controls, int accept, int pass_on)
@@ -8212,43 +8204,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8212 8204
8213 return -1; 8205 return -1;
8214 } 8206 }
8215 8207
8216 public void llSetInventoryPermMask(string item, int mask, int value) 8208 public void llSetInventoryPermMask(string item, int mask, int value)
8217 { 8209 {
8218 m_host.AddScriptLPS(1); 8210 m_host.AddScriptLPS(1);
8219 if (m_ScriptEngine.Config.GetBoolean("AllowGodFunctions", false)) 8211 NotImplemented("llSetInventoryPermMask");
8220 {
8221 if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
8222 {
8223 lock (m_host.TaskInventory)
8224 {
8225 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8226 {
8227 if (inv.Value.Name == item)
8228 {
8229 switch (mask)
8230 {
8231 case 0:
8232 inv.Value.BasePermissions = (uint)value;
8233 break;
8234 case 1:
8235 inv.Value.CurrentPermissions = (uint)value;
8236 break;
8237 case 2:
8238 inv.Value.GroupPermissions = (uint)value;
8239 break;
8240 case 3:
8241 inv.Value.EveryonePermissions = (uint)value;
8242 break;
8243 case 4:
8244 inv.Value.NextPermissions = (uint)value;
8245 break;
8246 }
8247 }
8248 }
8249 }
8250 }
8251 }
8252 } 8212 }
8253 8213
8254 public LSL_String llGetInventoryCreator(string item) 8214 public LSL_String llGetInventoryCreator(string item)