diff options
author | Justin Clark-Casey (justincc) | 2012-05-26 02:14:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-26 02:14:32 +0100 |
commit | 7fd38788b4a654983c11efbcddb107feb4b3634a (patch) | |
tree | 31ba5cdb7b57d8cb01e534cdeb8ea799d965a531 /OpenSim | |
parent | Mantis 6025 llRequestPermissions auto grant for NPCs. (diff) | |
download | opensim-SC-7fd38788b4a654983c11efbcddb107feb4b3634a.zip opensim-SC-7fd38788b4a654983c11efbcddb107feb4b3634a.tar.gz opensim-SC-7fd38788b4a654983c11efbcddb107feb4b3634a.tar.bz2 opensim-SC-7fd38788b4a654983c11efbcddb107feb4b3634a.tar.xz |
minor: code formatting from 0b72f773
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f3787a0..deb68b8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3421,11 +3421,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3421 | m_host.TaskInventory[m_item.ItemID].PermsMask = perm; | 3421 | m_host.TaskInventory[m_item.ItemID].PermsMask = perm; |
3422 | } | 3422 | } |
3423 | 3423 | ||
3424 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( | 3424 | m_ScriptEngine.PostScriptEvent( |
3425 | "run_time_permissions", new Object[] { | 3425 | m_item.ItemID, |
3426 | new LSL_Integer(perm) }, | 3426 | new EventParams( |
3427 | new DetectParams[0])); | 3427 | "run_time_permissions", new Object[] { new LSL_Integer(perm) }, new DetectParams[0])); |
3428 | } | 3428 | } |
3429 | |||
3429 | // it is an NPC, exit even if the permissions werent granted above, they are not going to answer | 3430 | // it is an NPC, exit even if the permissions werent granted above, they are not going to answer |
3430 | // the question! | 3431 | // the question! |
3431 | return; | 3432 | return; |
@@ -3454,10 +3455,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3454 | } | 3455 | } |
3455 | 3456 | ||
3456 | // Requested agent is not in range, refuse perms | 3457 | // Requested agent is not in range, refuse perms |
3457 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( | 3458 | m_ScriptEngine.PostScriptEvent( |
3458 | "run_time_permissions", new Object[] { | 3459 | m_item.ItemID, |
3459 | new LSL_Integer(0) }, | 3460 | new EventParams("run_time_permissions", new Object[] { new LSL_Integer(0) }, new DetectParams[0])); |
3460 | new DetectParams[0])); | ||
3461 | } | 3461 | } |
3462 | 3462 | ||
3463 | void handleScriptAnswer(IClientAPI client, UUID taskID, UUID itemID, int answer) | 3463 | void handleScriptAnswer(IClientAPI client, UUID taskID, UUID itemID, int answer) |
@@ -3476,10 +3476,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3476 | m_host.TaskInventory[m_item.ItemID].PermsMask = answer; | 3476 | m_host.TaskInventory[m_item.ItemID].PermsMask = answer; |
3477 | } | 3477 | } |
3478 | 3478 | ||
3479 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( | 3479 | m_ScriptEngine.PostScriptEvent( |
3480 | "run_time_permissions", new Object[] { | 3480 | m_item.ItemID, |
3481 | new LSL_Integer(answer) }, | 3481 | new EventParams("run_time_permissions", new Object[] { new LSL_Integer(answer) }, new DetectParams[0])); |
3482 | new DetectParams[0])); | ||
3483 | } | 3482 | } |
3484 | 3483 | ||
3485 | public LSL_String llGetPermissionsKey() | 3484 | public LSL_String llGetPermissionsKey() |