diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-04 16:44:18 -0500 | 
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-04 16:44:18 -0500 | 
| commit | b735ecb89912a90a597333f45dd853f2565c0928 (patch) | |
| tree | 46b508cd11a12317c2c6b720862a758a79fa6a43 | |
| parent | 7bd532a655c58ddf722a23604b86d75caa116013 (diff) | |
| parent | ee4a27ab7995db8677a23053614cfcafbccde524 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
5 files changed, 7 insertions, 7 deletions
| diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index 396699ad6c..d1b22a34bb 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -71,7 +71,7 @@       layout="topleft"       left_pad="10"       name="title" -     text_color="white" +     text_color="LtGray"       top="0"       use_ellipses="true"       value="Place Profile" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 7ac771de27..94c9b2de01 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -29,7 +29,7 @@       value="Place Profile" />      <string       name="title_teleport_history" -     value="Teleport History Location" /> +     value="Teleport History" />      <string       name="not_available"       value="(N\A)" /> @@ -156,7 +156,7 @@       layout="topleft"       left_pad="10"       name="title" -     text_color="white" +     text_color="LtGray"       top="0"       use_ellipses="true"       value="Place Profile" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index f5396951ca..607de65c5c 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -35,7 +35,7 @@        layout="topleft"        left_pad="10"        name="user_name" -      text_color="white" +      text_color="LtGray"        top="0"        value="(Loading...)"        use_ellipses="true" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index fab1f11273..bde45a9487 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -46,10 +46,10 @@ width="333">        top="0"        width="30" />        <text -      font="SansSerifHuge" +      font="SansSerifHugeBold"        height="20"        left_pad="5" -      text_color="white" +      text_color="LtGray"        top="3"        use_ellipses="true"        width="305" diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index e18f59ab64..18b59741bf 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -50,7 +50,7 @@       width="23" />      <text       follows="top|left|right" -     font="SansSerifHuge" +     font="SansSerifHugeBold"       height="26"       layout="topleft"       left_pad="10" | 
