diff options
| author | Justin Clark-Casey (justincc) | 2013-01-04 21:18:53 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-04 21:50:22 +0000 |
| commit | 3c631fea9eb6cb51e3a04d4d9846b210e7a8631a (patch) | |
| tree | 1d074d9a4abb22912326f51194015f415f8c4876 /OpenSim/Region | |
| parent | refactor: simplify llGetNumberOfPrims() to return prim count + sitting avatar... (diff) | |
| download | opensim-SC_OLD-3c631fea9eb6cb51e3a04d4d9846b210e7a8631a.zip opensim-SC_OLD-3c631fea9eb6cb51e3a04d4d9846b210e7a8631a.tar.gz opensim-SC_OLD-3c631fea9eb6cb51e3a04d4d9846b210e7a8631a.tar.bz2 opensim-SC_OLD-3c631fea9eb6cb51e3a04d4d9846b210e7a8631a.tar.xz | |
Automatically grant sit-related llRequestPermissions() for subsequent avatars sitting on the same scene obejct, instead of wrongly popping up request permissions dialog.
Resolves http://opensimulator.org/mantis/view.php?id=6478
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 14aaa86..967c249 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3412,21 +3412,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3412 | } | 3412 | } |
| 3413 | else | 3413 | else |
| 3414 | { | 3414 | { |
| 3415 | bool sitting = false; | 3415 | if (m_host.ParentGroup.GetSittingAvatars().Contains(agentID) |
| 3416 | if (m_host.SitTargetAvatar == agentID) | ||
| 3417 | { | ||
| 3418 | sitting = true; | ||
| 3419 | } | ||
| 3420 | else | ||
| 3421 | { | ||
| 3422 | foreach (SceneObjectPart p in m_host.ParentGroup.Parts) | ||
| 3423 | { | ||
| 3424 | if (p.SitTargetAvatar == agentID) | ||
| 3425 | sitting = true; | ||
| 3426 | } | ||
| 3427 | } | ||
| 3428 | |||
| 3429 | if (sitting) | ||
| 3430 | { | 3416 | { |
| 3431 | // When agent is sitting, certain permissions are implicit if requested from sitting agent | 3417 | // When agent is sitting, certain permissions are implicit if requested from sitting agent |
| 3432 | implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | | 3418 | implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | |