diff options
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 3f32be1d68..790c76e216 100755..100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -63,6 +63,7 @@ #include "llpaneltopinfobar.h" #include "llparcel.h" #include "llrendersphere.h" +#include "llscriptruntimeperms.h" #include "llsdmessage.h" #include "llsdutil.h" #include "llsky.h" @@ -92,7 +93,6 @@ #include "llwindow.h" #include "llworld.h" #include "llworldmap.h" -#include "lscript_byteformat.h" #include "stringize.h" #include "boost/foreach.hpp" @@ -4135,6 +4135,7 @@ void LLAgent::setTeleportState(ETeleportState state) } } + void LLAgent::stopCurrentAnimations() { // This function stops all current overriding animations on this @@ -4173,7 +4174,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 |