summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2012-05-18 21:01:10 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2012-05-18 21:01:10 +0300
commitd9cf4691a7369004a1ceeb11ca8d3262648c05e7 (patch)
treebfeee25cbae98ba152afbb6c8e5aa4231c126431 /indra/newview/skins
parentf4edcdd4090cb6704603d5ef0dc8cf7a3f67399e (diff)
MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)
- Requested permissions are added dynamically to the dialog's footer - And the footer is not shown when it is empty
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml4
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml1
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4e0f52b8fe..351e33c17c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6393,9 +6393,7 @@ It is rare that such a request is legitimate. Do not allow access if you do not
text="Deny"/>
</form>
<footer>
-If you allow access to your account, you will also be allowing the object to:
-Animate your avatar
-Act on your control inputs
+[FOOTERTEXT]
</footer>
</notification>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9752652679..9e8aa11583 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -393,6 +393,7 @@ Please try logging in again in a minute.</string>
<string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
+ <string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
<string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string>
<string name="ActOnControlInputs">Act on your control inputs</string>
<string name="RemapControlInputs">Remap your control inputs</string>