diff options
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png | bin | 1381 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_camera.xml | 29 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_status_bar.xml | 2 |
4 files changed, 9 insertions, 25 deletions
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png Binary files differdeleted file mode 100644 index 8cb51cdc8e..0000000000 --- a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index de9ed4d479..bc2abd0c02 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -98,7 +98,7 @@ with the same filename but different name <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> - <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="false" /> + <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="true" /> <texture name="Cam_FreeCam_Off" file_name="bottomtray/Cam_FreeCam_Off.png" preload="false" /> <texture name="Cam_Orbit_Off" file_name="bottomtray/Cam_Orbit_Off.png" preload="false" /> <texture name="Cam_Pan_Off" file_name="bottomtray/Cam_Pan_Off.png" preload="false" /> @@ -206,7 +206,6 @@ with the same filename but different name <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" /> <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" /> - <texture name="Presets_Icon_Camera" file_name="icons/Presets_Icon_Camera.png" preload="true" /> <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" /> <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 4eec922915..fdd27b35c2 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -250,18 +250,15 @@ name="buttons" width="226"> <button - height="23" - label="" + name="open_prefs_btn" + image_overlay="Icon_Gear_Foreground" + tool_tip = "Open view preferences" layout="topleft" left="70" - is_toggle="true" - image_overlay="Cam_Avatar_Off" - image_selected="PushButton_Selected_Press" - name="presets_btn" - tab_stop="false" - tool_tip="Preset Views" - top="13" - width="25"> + height="23" + width="28"> + <button.commit_callback + function="Presets.GoViewPrefs" /> </button> <button height="23" @@ -288,17 +285,5 @@ tool_tip="Camera modes" width="25"> </button> - - <button - name="open_prefs_btn" - image_overlay="Icon_Gear_Foreground" - tool_tip = "Open view preferences" - left_pad="45" - height="22" - width="28"> - <button.commit_callback - function="Presets.GoViewPrefs" /> - </button> - </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index c6a42ea612..299f019145 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -108,7 +108,7 @@ <icon follows="right|top" height="16" - image_name="Presets_Icon_Camera" + image_name="Cam_Avatar_Off" left_pad="8" top="2" name="presets_icon_camera" |
