diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-22 16:48:34 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-22 16:48:34 +0000 |
| commit | 9c4abda14f80c4f5ac0179b68a63114e222dba98 (patch) | |
| tree | f14c8b2f176915940dbc7e7139da92ac788d3f15 /indra/newview | |
| parent | 500d1ec0ccbad710392c323e9b1f46b2241f7f90 (diff) | |
| parent | 16b51a2c3a7de8e61ce3476b57c5b5f5bd45d198 (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png | bin | 228 -> 749 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png | bin | 291 -> 790 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tos.xml | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png Binary files differindex 1e7d7beafa..421f5e1705 100644 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png Binary files differindex a70d3abbbf..293aeef5e6 100644 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml index 5e168fe4aa..f3665e87ed 100644 --- a/indra/newview/skins/default/xui/en/floater_tos.xml +++ b/indra/newview/skins/default/xui/en/floater_tos.xml @@ -33,7 +33,7 @@ <check_box follows="top|right" height="16" - label="I Agree to the Terms of Service" + label="I Agree to the Terms of Service and Privacy Policy" layout="topleft" left_delta="0" name="agree_chk" @@ -51,7 +51,7 @@ top_delta="-399" word_wrap="true" width="552"> - Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement. + Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement. </text> <web_browser follows="left|top" |
