aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs24
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs2
3 files changed, 25 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index ce033ad..c6b15d5 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1637,9 +1637,9 @@ namespace OpenSim.Region.ScriptEngine.Common
1637 m_LSL_Functions.llSetObjectPermMask(mask, value); 1637 m_LSL_Functions.llSetObjectPermMask(mask, value);
1638 } 1638 }
1639 1639
1640 public void llGetInventoryPermMask(string item, int mask) 1640 public int llGetInventoryPermMask(string item, int mask)
1641 { 1641 {
1642 m_LSL_Functions.llGetInventoryPermMask(item, mask); 1642 return m_LSL_Functions.llGetInventoryPermMask(item, mask);
1643 } 1643 }
1644 1644
1645 public void llSetInventoryPermMask(string item, int mask, int value) 1645 public void llSetInventoryPermMask(string item, int mask, int value)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index f66bfe4..499445a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4113,10 +4113,30 @@ namespace OpenSim.Region.ScriptEngine.Common
4113 } 4113 }
4114 } 4114 }
4115 4115
4116 public void llGetInventoryPermMask(string item, int mask) 4116 public int llGetInventoryPermMask(string item, int mask)
4117 { 4117 {
4118 m_host.AddScriptLPS(1); 4118 m_host.AddScriptLPS(1);
4119 NotImplemented("llGetInventoryPermMask"); 4119 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
4120 {
4121 if (inv.Value.Name == item)
4122 {
4123 switch (mask)
4124 {
4125 case 0:
4126 return (int)inv.Value.BaseMask;
4127 case 1:
4128 return (int)inv.Value.OwnerMask;
4129 case 2:
4130 return (int)inv.Value.GroupMask;
4131 case 3:
4132 return (int)inv.Value.EveryoneMask;
4133 case 4:
4134 return (int)inv.Value.NextOwnerMask;
4135 }
4136 }
4137 }
4138 return -1;
4139 //NotImplemented("llGetInventoryPermMask");
4120 } 4140 }
4121 4141
4122 public void llSetInventoryPermMask(string item, int mask, int value) 4142 public void llSetInventoryPermMask(string item, int mask, int value)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index c8b02da..baa07ba 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -560,7 +560,7 @@ namespace OpenSim.Region.ScriptEngine.Common
560 //wiki: llSetObjectPermMask(integer mask, integer value) 560 //wiki: llSetObjectPermMask(integer mask, integer value)
561 void llSetObjectPermMask(int mask, int value); 561 void llSetObjectPermMask(int mask, int value);
562 //wiki integer llGetInventoryPermMask(string item, integer mask) 562 //wiki integer llGetInventoryPermMask(string item, integer mask)
563 void llGetInventoryPermMask(string item, int mask); 563 int llGetInventoryPermMask(string item, int mask);
564 //wiki: llSetInventoryPermMask(string item, integer mask, integer value) 564 //wiki: llSetInventoryPermMask(string item, integer mask, integer value)
565 void llSetInventoryPermMask(string item, int mask, int value); 565 void llSetInventoryPermMask(string item, int mask, int value);
566 //wiki: key llGetInventoryCreator(string item) 566 //wiki: key llGetInventoryCreator(string item)