diff options
| author | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
| commit | 05fcb7c8126a3f3496d948affe7f2722c9ca8fad (patch) | |
| tree | 159e542492c5c1fab1a04ef8a29b22fd60e4766a /indra/newview/llagent.cpp | |
| parent | 50ab1e57ec21f2009013b3bc061047887cdd07d5 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llagent.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index b67da7c8af..d933537d2e 100755..100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -61,6 +61,7 @@ #include "llpaneltopinfobar.h" #include "llparcel.h" #include "llrendersphere.h" +#include "llscriptruntimeperms.h" #include "llsdutil.h" #include "llsky.h" #include "llslurl.h" @@ -89,7 +90,6 @@ #include "llwindow.h" #include "llworld.h" #include "llworldmap.h" -#include "lscript_byteformat.h" #include "stringize.h" #include "boost/foreach.hpp" #include "llcorehttputil.h" @@ -4173,6 +4173,7 @@ void LLAgent::setTeleportState(ETeleportState state) } } + void LLAgent::stopCurrentAnimations() { // This function stops all current overriding animations on this @@ -4211,7 +4212,7 @@ void LLAgent::stopCurrentAnimations() if (mRegionp && gSavedSettings.getBOOL("RevokePermsOnStopAnimation")) { - 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; sendRevokePermissions(mRegionp->getRegionID(), permissions); if (gAgentAvatarp->isSitting()) { // Also stand up, since auto-granted sit animation permission has been revoked |