diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2013-04-30 16:04:41 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2013-04-30 16:04:41 -0700 |
| commit | 474905badef4679bbce53306c49343703be38263 (patch) | |
| tree | 2c7825b83c12e5396a4b04ec8e34ba53c61f88bf /indra/newview/skins/default/xui | |
| parent | 0bc7056ae6b314fac508f2c417cc5818107cb72e (diff) | |
MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
* Add the newer run time permissions to the viewer
* Filter requested permissions by those the viewer knows about
* Show a dialog indicating unknown permissions were requested and a new viewer
will be needed to grant them.
reviewed with Simon and Soft
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 23 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 7 |
2 files changed, 28 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 105bef7321..1f39ec041e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6863,8 +6863,29 @@ Do not allow access if you do not fully understand why it wants access to your a [FOOTERTEXT] </footer> </notification> + + <notification + icon="notify.tga" + name="UnknownScriptQuestion" + persist="false" + type="notify"> + '<nolink>[OBJECTNAME]</nolink>', an object owned by '[NAME]', requested an unknown script runtime permission. + +Please update your viewer to grant this permission. + <tag>confirm</tag> + <form name="form"> + <button + index="0" + name="Ok" + text="Ok"/> + <button + index="2" + name="Mute" + text="Block"/> + </form> + </notification> - <notification + <notification icon="notify.tga" name="ScriptDialog" show_toast="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7c08aef65e..e52e941c28 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -410,7 +410,12 @@ Please try logging in again in a minute.</string> <string name="NotConnected">Not Connected</string> <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> <string name="TeleportYourAgent">Teleport you</string> - + <string name="JoinAnExperience">Join an experience</string> <!-- not used --> + <string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string> + <string name="OverrideYourAnimations">Replace your default animations</string> + <string name="ScriptReturnObjects">Return objects on your behalf</string> + <string name="UnknownScriptPermission">(unknown)!</string> + <!-- Sim Access labels --> <string name="SIM_ACCESS_PG">General</string> <string name="SIM_ACCESS_MATURE">Moderate</string> |