livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset 9c8142fbc4df - change is available upstream

master
Ansariel 2016-03-10 08:48:21 +01:00
parent 47ebbd5006
commit 7ac279bc1d
2 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
indra/newview/llagent.cpp
View File

@ -67,7 +67,6 @@
#include "llpaneltopinfobar.h"
#include "llparcel.h"
#include "llrendersphere.h"
#include "llscriptruntimeperms.h"
#include "llsdmessage.h"
#include "llsdutil.h"
#include "llsky.h"
@ -4941,51 +4940,48 @@ void LLAgent::stopCurrentAnimations(bool force_keep_script_perms /*= false*/)
// </FS:Ansariel>
gSavedSettings.getBOOL("RevokePermsOnStopAnimation"))
{
// <FS:Ansariel> Undo script permission bits cruft
// typedef enum e_lscript_runtime_permissions
// {
// SCRIPT_PERMISSION_DEBIT,
// SCRIPT_PERMISSION_TAKE_CONTROLS,
// SCRIPT_PERMISSION_REMAP_CONTROLS,
// SCRIPT_PERMISSION_TRIGGER_ANIMATION,
// SCRIPT_PERMISSION_ATTACH,
// SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
// SCRIPT_PERMISSION_CHANGE_LINKS,
// SCRIPT_PERMISSION_CHANGE_JOINTS,
// SCRIPT_PERMISSION_CHANGE_PERMISSIONS,
// SCRIPT_PERMISSION_TRACK_CAMERA,
// SCRIPT_PERMISSION_CONTROL_CAMERA,
// SCRIPT_PERMISSION_TELEPORT,
// SCRIPT_PERMISSION_EXPERIENCE,
// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT,
// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
// SCRIPT_PERMISSION_RETURN_OBJECTS,
// SCRIPT_PERMISSION_EOF
// } LSCRIPTRunTimePermissions;
typedef enum e_lscript_runtime_permissions
{
SCRIPT_PERMISSION_DEBIT,
SCRIPT_PERMISSION_TAKE_CONTROLS,
SCRIPT_PERMISSION_REMAP_CONTROLS,
SCRIPT_PERMISSION_TRIGGER_ANIMATION,
SCRIPT_PERMISSION_ATTACH,
SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
SCRIPT_PERMISSION_CHANGE_LINKS,
SCRIPT_PERMISSION_CHANGE_JOINTS,
SCRIPT_PERMISSION_CHANGE_PERMISSIONS,
SCRIPT_PERMISSION_TRACK_CAMERA,
SCRIPT_PERMISSION_CONTROL_CAMERA,
SCRIPT_PERMISSION_TELEPORT,
SCRIPT_PERMISSION_EXPERIENCE,
SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT,
SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
SCRIPT_PERMISSION_RETURN_OBJECTS,
SCRIPT_PERMISSION_EOF
} LSCRIPTRunTimePermissions;
// const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
// {
// (0x1 << 1), // SCRIPT_PERMISSION_DEBIT,
// (0x1 << 2), // SCRIPT_PERMISSION_TAKE_CONTROLS,
// (0x1 << 3), // SCRIPT_PERMISSION_REMAP_CONTROLS,
// (0x1 << 4), // SCRIPT_PERMISSION_TRIGGER_ANIMATION,
// (0x1 << 5), // SCRIPT_PERMISSION_ATTACH,
// (0x1 << 6), // SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
// (0x1 << 7), // SCRIPT_PERMISSION_CHANGE_LINKS,
// (0x1 << 8), // SCRIPT_PERMISSION_CHANGE_JOINTS,
// (0x1 << 9), // SCRIPT_PERMISSION_CHANGE_PERMISSIONS
// (0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA
// (0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA
// (0x1 << 12),// SCRIPT_PERMISSION_TELEPORT
// (0x1 << 13),// SCRIPT_PERMISSION_EXPERIENCE
// (0x1 << 14),// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT
// (0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS
// (0x1 << 16),// SCRIPT_PERMISSION_RETURN_OBJECTS
// };
const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
{
(0x1 << 1), // SCRIPT_PERMISSION_DEBIT,
(0x1 << 2), // SCRIPT_PERMISSION_TAKE_CONTROLS,
(0x1 << 3), // SCRIPT_PERMISSION_REMAP_CONTROLS,
(0x1 << 4), // SCRIPT_PERMISSION_TRIGGER_ANIMATION,
(0x1 << 5), // SCRIPT_PERMISSION_ATTACH,
(0x1 << 6), // SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
(0x1 << 7), // SCRIPT_PERMISSION_CHANGE_LINKS,
(0x1 << 8), // SCRIPT_PERMISSION_CHANGE_JOINTS,
(0x1 << 9), // SCRIPT_PERMISSION_CHANGE_PERMISSIONS
(0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA
(0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA
(0x1 << 12),// SCRIPT_PERMISSION_TELEPORT
(0x1 << 13),// SCRIPT_PERMISSION_EXPERIENCE
(0x1 << 14),// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT
(0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS
(0x1 << 16),// SCRIPT_PERMISSION_RETURN_OBJECTS
};
//U32 permissions = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TRIGGER_ANIMATION] | LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS];
U32 permissions = SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_TRIGGER_ANIMATION].permbit | SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS].permbit;
// <FS:Ansariel>
U32 permissions = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TRIGGER_ANIMATION] | LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS];
sendRevokePermissions(mRegionp->getRegionID(), permissions);
if (gAgentAvatarp->isSitting())
{ // Also stand up, since auto-granted sit animation permission has been revoked

2
indra/newview/llscriptruntimeperms.h
View File

@ -41,10 +41,8 @@ const U32 NUM_SCRIPT_PERMISSIONS = 16;
const S32 SCRIPT_PERMISSION_DEBIT = 0;
// <FS:Ansariel> Also required indexes
const S32 SCRIPT_PERMISSION_TAKE_CONTROLS = 1;
const S32 SCRIPT_PERMISSION_TRIGGER_ANIMATION = 3;
const S32 SCRIPT_PERMISSION_ATTACH = 4;
const S32 SCRIPT_PERMISSION_TELEPORT = 11;
const S32 SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS = 14;
// </FS:Ansariel>
static const boost::array<script_perm_t, NUM_SCRIPT_PERMISSIONS> SCRIPT_PERMISSIONS = {{