diff options
author | Richard Linden <none@none> | 2011-04-07 11:06:21 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-07 11:06:21 -0700 |
commit | 24b0b66252610660fecc942b867ffa41213b6a3f (patch) | |
tree | ab6ce7e6124f268b0f452450c51a671826872604 /indra/newview | |
parent | b7973b30610b57f130cbdd2eb3e2ec04d62e06bf (diff) | |
parent | d582f40315b7fa78added723d8a96ffd84514fdc (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8f5a95a504..318bc9251f 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7022,27 +7022,28 @@ Hiding the Speak button will disable the voice feature. </notification> <notification - name="HintDisplayName" - label="Display Name" - type="hint" - unique="true"> - Set your customizable display name here. This is in addition to your unique username, which can't be changed. You can change how you see other people's names in your preferences. - </notification> - - <notification name="HintMoveClick" - label="Move" + label="" type="hint" unique="true"> -Click to Walk +1. Click to Walk Click anywhere on the ground to walk to that spot. -Click and Drag to Rotate View +2. Click and Drag to Rotate View Click and drag anywhere on the world to rotate your view <tag>custom_skin</tag> </notification> <notification + name="HintDisplayName" + label="Display Name" + type="hint" + unique="true"> + Set your customizable display name here. This is in addition to your unique username, which can't be changed. You can change how you see other people's names in your preferences. + </notification> + + + <notification name="HintView" label="View" type="hint" |