diff options
| author | Richard Linden <none@none> | 2011-04-19 13:33:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-19 13:33:47 -0700 |
| commit | 08fa1c613a263e78f93a642329e9700d6708a46e (patch) | |
| tree | 264904ed70311c3fa68d94af269f3199f6084d74 /indra/newview/skins/default/xui/en | |
| parent | fbf886b7cc379bb4b9e409923b658af0b5c8fdef (diff) | |
| parent | 1fbdd880d9ad3bb660d6b1fa20c643613f09eb06 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-3
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 23 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index cd25a2a8dd..3fb3717e68 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" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index ef25588ca3..6954a8b53a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -42,7 +42,7 @@ </text> <check_box height="16" - enabled="true" + enabled="false" label="Show me in Search results" layout="topleft" left="30" |