diff options
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 13 | ||||
| -rwxr-xr-x | indra/newview/llagent.cpp | 40 | ||||
| -rwxr-xr-x | indra/newview/llagent.h | 1 |
3 files changed, 52 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 29ad355f75..3964ea5fac 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9697,7 +9697,18 @@ <key>Value</key> <integer>1</integer> </map> - <key>RotateRight</key> + <key>RevokePermsOnStopAnimation</key> + <map> + <key>Comment</key> + <string>Clear animation permssions when choosing "Stop Animating Me"</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>RotateRight</key> <map> <key>Comment</key> <string>Make the agent rotate to its right.</string> diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 1a96699cff..3b83811c78 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -90,6 +90,7 @@ #include "llwindow.h" #include "llworld.h" #include "llworldmap.h" +#include "lscript_byteformat.h" #include "stringize.h" using namespace LLAvatarAppearanceDefines; @@ -3072,6 +3073,31 @@ void LLAgent::sendAnimationStateReset() sendReliableMessage(); } + +// Send a message to the region to revoke sepecified permissions on ALL scripts in the region +// If the target is an object in the region, permissions in scripts on that object are cleared. +// If it is the region ID, all scripts clear the permissions for this agent +void LLAgent::sendRevokePermissions(const LLUUID & target, U32 permissions) +{ + // Currently only the bits for SCRIPT_PERMISSION_TRIGGER_ANIMATION and SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS + // are supported by the server. Sending any other bits will cause the message to be dropped without changing permissions + + if (gAgentID.notNull() && gMessageSystem) + { + LLMessageSystem* msg = gMessageSystem; + msg->newMessageFast(_PREHASH_RevokePermissions); + msg->nextBlockFast(_PREHASH_AgentData); + msg->addUUIDFast(_PREHASH_AgentID, getID()); // Must be our ID + msg->addUUIDFast(_PREHASH_SessionID, getSessionID()); + + msg->nextBlockFast(_PREHASH_Data); + msg->addUUIDFast(_PREHASH_ObjectID, target); // Must be in the region + msg->addS32Fast(_PREHASH_ObjectPermissions, (S32) permissions); + + sendReliableMessage(); + } +} + void LLAgent::sendWalkRun(bool running) { LLMessageSystem* msgsys = gMessageSystem; @@ -4175,9 +4201,21 @@ void LLAgent::stopCurrentAnimations() sendAnimationRequests(anim_ids, ANIM_REQUEST_STOP); - // Tell the region to clear any animation state overrides. + // Tell the region to clear any animation state overrides sendAnimationStateReset(); + // Revoke all animation permissions + if (mRegionp && + gSavedSettings.getBOOL("RevokePermsOnStopAnimation")) + { + 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 + gAgent.standUp(); + } + } + // re-assert at least the default standing animation, because // viewers get confused by avs with no associated anims. sendAnimationRequest(ANIM_AGENT_STAND, diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index c5b4476318..7fac17d098 100755 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -432,6 +432,7 @@ public: void sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request); void sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request); void sendAnimationStateReset(); + void sendRevokePermissions(const LLUUID & target, U32 permissions); void endAnimationUpdateUI(); void unpauseAnimation() { mPauseRequest = NULL; } |