diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-07 10:13:09 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-07 10:13:09 -0400 |
| commit | aef4f6ccabe0b2f72296f1a4ae5634080396690a (patch) | |
| tree | e70a5224e61e10763207dc02cfcccd062ce5b663 /indra/newview/skins/default/textures | |
| parent | a5522ff5bd94a740eb44ff33f33b4b4cd6f1c16e (diff) | |
| parent | f85ed5a1064d1ed54ba7e25a6b85ca36664c7d61 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png | bin | 0 -> 231 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png | bin | 0 -> 218 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png Binary files differnew file mode 100644 index 0000000000..a79d999932 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png Binary files differnew file mode 100644 index 0000000000..b692ed92da --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 40e882757f..082b37d80b 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -276,9 +276,9 @@ with the same filename but different name <texture name="Movement_Up_Off" file_name="bottomtray/Movement_Up_Off.png" preload="false" /> <texture name="Movement_Up_On" file_name="bottomtray/Movement_Up_On.png" preload="false" /> - <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="NavBar_BG" file_name="navbar/NavBar_BG.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> - + <texture name="NavBar_BG_NoFav_Bevel" file_name="navbar/NavBar_BG_NoFav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> + <texture name="NavBar_BG_NoNav_Bevel" file_name="navbar/NavBar_BG_NoNav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="Notices_Unread" file_name="bottomtray/Notices_Unread.png" preload="true" /> |
