diff options
| author | Melanie | 2010-02-22 03:00:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-22 03:00:59 +0000 |
| commit | 1f45e6c6497e05638f014e92098165befbbea100 (patch) | |
| tree | 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Region/ScriptEngine/Shared | |
| parent | One more test running. (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.xz | |
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 64 |
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) |