diff options
| author | James Cook <james@lindenlab.com> | 2009-09-22 23:24:20 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-09-22 23:24:20 +0000 |
| commit | 1b71689ad7509253aea12430504cde11658ac1c2 (patch) | |
| tree | c718e599f4350406bb52d1536275fa09697caab7 | |
| parent | 32d88d3879ddeb86eb2050af098394b482bfc762 (diff) | |
EXT-331 Speak button uses the "Pressed" state and not the "Active/Selected/On" state. Speak button was hard-coded to segmented-button art -- removed hard-coding so it uses normal button params. Also changed walk-mode and camera-mode icons to use green backgrounds, which emphasizes the radio-button aspect of the controls. Reviewed with Erica.
| -rw-r--r-- | indra/newview/llchiclet.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_camera.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_moveview.xml | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 42ed783f94..a2dc97f7f5 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -1079,8 +1079,9 @@ LLTalkButton::Params::Params() speak_button.tab_stop(false); speak_button.is_toggle(true); speak_button.picture_style(true); - speak_button.image_selected(LLUI::getUIImage("SegmentedBtn_Left_Selected")); - speak_button.image_unselected(LLUI::getUIImage("SegmentedBtn_Left_Off")); + // Use default button art. JC + //speak_button.image_selected(LLUI::getUIImage("SegmentedBtn_Left_Selected")); + //speak_button.image_unselected(LLUI::getUIImage("SegmentedBtn_Left_Off")); show_button.name("right"); show_button.label(LLStringUtil::null); diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 4a8830ed5a..1592ed4aa4 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -94,6 +94,7 @@ left="2" is_toggle="true" image_overlay="Cam_Orbit_Off" + image_selected="PushButton_Selected_Press" name="orbit_btn" tab_stop="false" tool_tip="Orbit Camera" @@ -107,6 +108,7 @@ left_pad="0" is_toggle="true" image_overlay="Cam_Pan_Off" + image_selected="PushButton_Selected_Press" name="pan_btn" tab_stop="false" tool_tip="Pan Camera" @@ -118,6 +120,7 @@ layout="topleft" left_pad="0" image_overlay="Cam_Avatar_Off" + image_selected="PushButton_Selected_Press" name="avatarview_btn" tab_stop="false" tool_tip="See as Avatar" @@ -130,6 +133,7 @@ left_pad="0" is_toggle="true" image_overlay="Cam_FreeCam_Off" + image_selected="PushButton_Selected_Press" name="freecamera_btn" tab_stop="false" tool_tip="View Object" diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index b7006cf248..dc0ff7ac4c 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -138,6 +138,7 @@ follows="left|bottom" height="23" image_overlay="Move_Walk_Off" + image_selected="PushButton_Selected_Press" label="" layout="topleft" name="mode_walk_btn" @@ -151,6 +152,7 @@ font="SansSerifSmall" height="23" image_overlay="Move_Run_Off" + image_selected="PushButton_Selected_Press" label="" layout="topleft" left_pad="0" @@ -164,6 +166,7 @@ follows="left|bottom" height="23" image_overlay="Move_Fly_Off" + image_selected="PushButton_Selected_Press" label="" layout="topleft" left_pad="0" |