aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 14:10:19 -0800
committerJohn Hurliman2010-02-22 14:10:19 -0800
commit71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch)
treecca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Region/ScriptEngine/Shared/Api
parent* Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff)
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
downloadopensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs64
1 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a421484..dc4249c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8192,38 +8192,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8192 { 8192 {
8193 m_host.AddScriptLPS(1); 8193 m_host.AddScriptLPS(1);
8194 if (m_ScriptEngine.Config.GetBoolean("AllowGodFunctions", false)) 8194 if (m_ScriptEngine.Config.GetBoolean("AllowGodFunctions", false))
8195 { 8195 {
8196 if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) 8196 if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
8197 { 8197 {
8198 lock (m_host.TaskInventory) 8198 lock (m_host.TaskInventory)
8199 { 8199 {
8200 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8200 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8201 { 8201 {
8202 if (inv.Value.Name == item) 8202 if (inv.Value.Name == item)
8203 { 8203 {
8204 switch (mask) 8204 switch (mask)
8205 { 8205 {
8206 case 0: 8206 case 0:
8207 inv.Value.BasePermissions = (uint)value; 8207 inv.Value.BasePermissions = (uint)value;
8208 break; 8208 break;
8209 case 1: 8209 case 1:
8210 inv.Value.CurrentPermissions = (uint)value; 8210 inv.Value.CurrentPermissions = (uint)value;
8211 break; 8211 break;
8212 case 2: 8212 case 2:
8213 inv.Value.GroupPermissions = (uint)value; 8213 inv.Value.GroupPermissions = (uint)value;
8214 break; 8214 break;
8215 case 3: 8215 case 3:
8216 inv.Value.EveryonePermissions = (uint)value; 8216 inv.Value.EveryonePermissions = (uint)value;
8217 break; 8217 break;
8218 case 4: 8218 case 4:
8219 inv.Value.NextPermissions = (uint)value; 8219 inv.Value.NextPermissions = (uint)value;
8220 break; 8220 break;
8221 } 8221 }
8222 } 8222 }
8223 } 8223 }
8224 } 8224 }
8225 } 8225 }
8226 } 8226 }
8227 } 8227 }
8228 8228
8229 public LSL_String llGetInventoryCreator(string item) 8229 public LSL_String llGetInventoryCreator(string item)