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

Split up stop avatar animations menu option to allow legacy animation stopping without revoking permissions and stopping animations including revoking permissions

Ansariel 2014-01-23 17:46:11 +01:00
parent 80d9b73152
commit a755d80fd3
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llviewermenu.cpp
View File

@ -6126,7 +6126,18 @@ class LLToolsStopAllAnimations : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
gAgent.stopCurrentAnimations();
// <FS:Ansariel> Allow legacy stop animations without revoking script permissions
//gAgent.stopCurrentAnimations();
std::string param = userdata.asString();
if (param.empty() || param == "stoprevoke")
{
gAgent.stopCurrentAnimations();
}
else if (param == "stop")
{
gAgent.stopCurrentAnimations(true);
}
// </FS:Ansariel>
return true;
}
};

11
indra/newview/skins/default/xui/de/menu_viewer.xml
View File

@ -12,7 +12,7 @@
<menu_item_call label="Auswahlen" name="Picks"/>
<menu_item_call label="Auf Facebook posten" name="PostToFacebook"/>
<menu_item_call label="Outfit ändern" name="ChangeOutfit"/>
<menu_item_call label="Foto machen" name="Take Snapshot"/>
<menu_item_call label="Foto machen" name="Take Snapshot"/>
<menu_item_check label="Inventar" name="Inventory"/>
<menu_item_check label="Inventar" name="ShowSidetrayInventory"/>
<menu_item_check label="Steuerung" name="Movement Controls"/>
@ -20,16 +20,17 @@
<menu_item_call label="Hinsetzen" name="Sit Down Here"/>
<menu_item_check label="Fliegen" name="Fly"/>
<menu_item_check label="Immer rennen" name="Always Run"/>
<menu_item_check label="Sitzen erzwingen" name="Force Toggle Sitting"/>
<menu_item_check label="Movelock" name="Move Lock"/>
<menu_item_check label="Sitzen erzwingen" name="Force Toggle Sitting"/>
<menu_item_check label="Movelock" name="Move Lock"/>
</menu>
<menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
<menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
<menu label="Avatar-Befinden" name="avhealth">
<menu_item_call label="Avatar-Animationen stoppen" name="Stop Animating My Avatar"/>
<menu_item_call label="Avatar-Animationen stoppen &amp; Skripten Rechte entziehen" name="Stop Animating My Avatar With Revoke"/>
<menu_item_call label="Avatar undeformieren" name="undeform_avatar"/>
<menu_item_call label="Aktualisiere Aussehen (Rebake)" name="Rebake Texture"/>
<menu_item_call label="Auf männlichen Standard-Avatar zurücksetzen" name="ResetDefaultAvM"/>
<menu_item_call label="Auf weiblichen Standard-Avatar zurücksetzen" name="ResetDefaultAvF"/>
<menu_item_call label="Auf weiblichen Standard-Avatar zurücksetzen" name="ResetDefaultAvF"/>
<menu_item_check label="Render-Weight für Avatare anzeigen (Ersatz für ARC)" name="Avatar Rendering Cost"/>
<menu_item_call label="Lag-Meter" name="Lag Meter"/>
<menu_item_call label="LSL-Brücke neu erstellen" name="Recreate LSL Bridge"/>

20
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -235,12 +235,20 @@
label="Avatar Health"
name="avhealth"
tear_off="true">
<menu_item_call
label="Stop Avatar Animations"
name="Stop Animating My Avatar">
<menu_item_call.on_click
function="Tools.StopAllAnimations" />
</menu_item_call>
<menu_item_call
label="Stop Avatar Animations"
name="Stop Animating My Avatar">
<menu_item_call.on_click
function="Tools.StopAllAnimations"
parameter="stop"/>
</menu_item_call>
<menu_item_call
label="Stop Avatar Animations &amp; Revoke Permissions"
name="Stop Animating My Avatar With Revoke">
<menu_item_call.on_click
function="Tools.StopAllAnimations"
parameter="stoprevoke"/>
</menu_item_call>
<menu_item_call
label="Undeform Avatar"
name="undeform_avatar">