diff options
| author | James Cook <james@lindenlab.com> | 2010-01-11 12:02:25 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-11 12:02:25 -0800 |
| commit | bbcbed2539ff32275e95a5e0c1e9474eb04b2311 (patch) | |
| tree | 59de81934f879d83b99c945711c066f49686e07f /indra/newview | |
| parent | 6473dbf588746ca6871dd89c80ecace1a50a5672 (diff) | |
| parent | 77f799b23ae0e978101745ab76cf079f6d0ed09f (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Landmark.png | bin | 532 -> 582 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png | bin | 335 -> 405 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png | bin | 456 -> 653 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 2 |
4 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Landmark.png b/indra/newview/skins/default/textures/icons/Inv_Landmark.png Binary files differindex f8ce765c50..76df984596 100644 --- a/indra/newview/skins/default/textures/icons/Inv_Landmark.png +++ b/indra/newview/skins/default/textures/icons/Inv_Landmark.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png Binary files differindex ada28e01da..f5a5f7a846 100644 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png Binary files differindex 0f8d5619ec..8e0fb9661e 100644 --- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index cd297af99d..ccbba61ddf 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -9,7 +9,7 @@ save_rect="true"
save_visibility="true"
single_instance="true"
- title="Instant Messages"
+ title="CONVERSATIONS"
width="392">
<tab_container
follows="left|right|top|bottom"
|
