Thank you, HomerHorwitz, for a patch that add PERMISSION_CONTROL_CAMERA
Fixes Mantis #18610.6.0-stable
parent
b3e19359d9
commit
244ad2e614
|
@ -1848,6 +1848,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
|
||||||
public const int PERMISSION_CHANGE_JOINTS = 256;
|
public const int PERMISSION_CHANGE_JOINTS = 256;
|
||||||
public const int PERMISSION_CHANGE_PERMISSIONS = 512;
|
public const int PERMISSION_CHANGE_PERMISSIONS = 512;
|
||||||
public const int PERMISSION_TRACK_CAMERA = 1024;
|
public const int PERMISSION_TRACK_CAMERA = 1024;
|
||||||
|
public const int PERMISSION_CONTROL_CAMERA = 2048;
|
||||||
public const int AGENT_FLYING = 1;
|
public const int AGENT_FLYING = 1;
|
||||||
public const int AGENT_ATTACHMENTS = 2;
|
public const int AGENT_ATTACHMENTS = 2;
|
||||||
public const int AGENT_SCRIPTED = 4;
|
public const int AGENT_SCRIPTED = 4;
|
||||||
|
|
|
@ -2083,6 +2083,7 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
public const int PERMISSION_CHANGE_JOINTS = 256;
|
public const int PERMISSION_CHANGE_JOINTS = 256;
|
||||||
public const int PERMISSION_CHANGE_PERMISSIONS = 512;
|
public const int PERMISSION_CHANGE_PERMISSIONS = 512;
|
||||||
public const int PERMISSION_TRACK_CAMERA = 1024;
|
public const int PERMISSION_TRACK_CAMERA = 1024;
|
||||||
|
public const int PERMISSION_CONTROL_CAMERA = 2048;
|
||||||
|
|
||||||
public const int AGENT_FLYING = 1;
|
public const int AGENT_FLYING = 1;
|
||||||
public const int AGENT_ATTACHMENTS = 2;
|
public const int AGENT_ATTACHMENTS = 2;
|
||||||
|
|
|
@ -2559,6 +2559,7 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
// When attached, certain permissions are implicit if requested from owner
|
// When attached, certain permissions are implicit if requested from owner
|
||||||
int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS |
|
int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS |
|
||||||
BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION |
|
BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION |
|
||||||
|
BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA |
|
||||||
BuiltIn_Commands_BaseClass.PERMISSION_ATTACH;
|
BuiltIn_Commands_BaseClass.PERMISSION_ATTACH;
|
||||||
|
|
||||||
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
||||||
|
@ -2576,6 +2577,7 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
{
|
{
|
||||||
// When agent is sitting, certain permissions are implicit if requested from sitting agent
|
// When agent is sitting, certain permissions are implicit if requested from sitting agent
|
||||||
int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION |
|
int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION |
|
||||||
|
BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA |
|
||||||
BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA;
|
BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA;
|
||||||
|
|
||||||
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
||||||
|
|
|
@ -2437,6 +2437,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
// When attached, certain permissions are implicit if requested from owner
|
// When attached, certain permissions are implicit if requested from owner
|
||||||
int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
|
int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
|
||||||
ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
|
ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
|
||||||
|
ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
|
||||||
ScriptBaseClass.PERMISSION_ATTACH;
|
ScriptBaseClass.PERMISSION_ATTACH;
|
||||||
|
|
||||||
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
||||||
|
@ -2456,6 +2457,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
{
|
{
|
||||||
// When agent is sitting, certain permissions are implicit if requested from sitting agent
|
// When agent is sitting, certain permissions are implicit if requested from sitting agent
|
||||||
int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
|
int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
|
||||||
|
ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
|
||||||
ScriptBaseClass.PERMISSION_TRACK_CAMERA;
|
ScriptBaseClass.PERMISSION_TRACK_CAMERA;
|
||||||
|
|
||||||
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
||||||
|
|
|
@ -76,6 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
public const int PERMISSION_CHANGE_JOINTS = 256;
|
public const int PERMISSION_CHANGE_JOINTS = 256;
|
||||||
public const int PERMISSION_CHANGE_PERMISSIONS = 512;
|
public const int PERMISSION_CHANGE_PERMISSIONS = 512;
|
||||||
public const int PERMISSION_TRACK_CAMERA = 1024;
|
public const int PERMISSION_TRACK_CAMERA = 1024;
|
||||||
|
public const int PERMISSION_CONTROL_CAMERA = 2048;
|
||||||
|
|
||||||
public const int AGENT_FLYING = 1;
|
public const int AGENT_FLYING = 1;
|
||||||
public const int AGENT_ATTACHMENTS = 2;
|
public const int AGENT_ATTACHMENTS = 2;
|
||||||
|
|
Loading…
Reference in New Issue