diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 1c2abd74f6..6a71edb1a8 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -1,16 +1,33 @@ - + + + value="0.56 0.36 0.25 1.0" /> + + + + value="0.950 0.412 0.173 0.13" /> + value="0.950 0.412 0.173 0.35" /> @@ -204,7 +221,7 @@ + value="SchemeLightest" /> @@ -539,7 +556,7 @@ reference="DkGray" /> + reference="0.75 0.92 0.49 1.0" /> @@ -667,7 +684,7 @@ reference="LtGray" /> + reference="SchemeLightest_35" /> @@ -705,10 +722,10 @@ value="0 0 0 1" /> + reference="LtGray" /> + value="0.75 0.92 0.49 1.0" /> @@ -717,7 +734,7 @@ reference="White" /> + reference="LtGray" /> + reference="SchemeLightest" /> diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png index 6cb33efb93..de0c898c5f 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png and b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_Selected.png b/indra/newview/skins/default/textures/containers/Accordion_Selected.png index 6b3427b9e6..0a5229deb0 100644 Binary files a/indra/newview/skins/default/textures/containers/Accordion_Selected.png and b/indra/newview/skins/default/textures/containers/Accordion_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png index ed548d2767..7e4f11eea7 100644 Binary files a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png and b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png index a72c2a60b3..92eb4fe6bb 100644 Binary files a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png index dc05db927e..e21ba3f0f3 100644 Binary files a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png and b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png index 9f1e2a469d..1a40056604 100644 Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png index 0549971781..0523ecb493 100644 Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png index dd73d655e9..5da8948521 100644 Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png index c8cf26afb5..f0c5f897e1 100644 Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png index f6b775c2a0..17cdd6df62 100644 Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png index 4a6a05c561..10df58d45e 100644 Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png differ diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png index e962075467..4a27facfac 100644 Binary files a/indra/newview/skins/default/textures/navbar/Row_Selection.png and b/indra/newview/skins/default/textures/navbar/Row_Selection.png differ diff --git a/indra/newview/skins/default/textures/square_btn_32x128.tga b/indra/newview/skins/default/textures/square_btn_32x128.tga index e3ac5706ac..505be99e12 100644 Binary files a/indra/newview/skins/default/textures/square_btn_32x128.tga and b/indra/newview/skins/default/textures/square_btn_32x128.tga differ diff --git a/indra/newview/skins/default/textures/square_btn_selected_32x128.tga b/indra/newview/skins/default/textures/square_btn_selected_32x128.tga index 371da6424d..aecacef453 100644 Binary files a/indra/newview/skins/default/textures/square_btn_selected_32x128.tga and b/indra/newview/skins/default/textures/square_btn_selected_32x128.tga differ diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png index ba1a9c13c1..5135157486 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png and b/indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png differ diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png index 8906ad5671..5e97864d54 100644 Binary files a/indra/newview/skins/default/textures/widgets/DropDown_On.png and b/indra/newview/skins/default/textures/widgets/DropDown_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png index e6bab4cf8b..ba3b8ba10c 100644 Binary files a/indra/newview/skins/default/textures/widgets/ListItem_Select.png and b/indra/newview/skins/default/textures/widgets/ListItem_Select.png differ diff --git a/indra/newview/skins/default/textures/widgets/ProgressBar.png b/indra/newview/skins/default/textures/widgets/ProgressBar.png index 903430591a..8d059c64f4 100644 Binary files a/indra/newview/skins/default/textures/widgets/ProgressBar.png and b/indra/newview/skins/default/textures/widgets/ProgressBar.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png index 36c50d8b7e..54dde54918 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_On.png and b/indra/newview/skins/default/textures/widgets/PushButton_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png index 597500fceb..8227d0f22c 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png and b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png index 899fefbdf4..469b481e4d 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png and b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png index 36c50d8b7e..df7e48546f 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png index 597500fceb..9572e3edcb 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png index 899fefbdf4..f092dc71ba 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png index 10ef19a9b2..9aa41f41b4 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png index 10ef19a9b2..7dca3fd13b 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png index 61448e2e62..63f9cfa254 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png index f01a1993d6..ac0cfa2901 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png index 10ef19a9b2..397da9d85a 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png index 61448e2e62..10e32537e6 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png index f01a1993d6..e406fc94c7 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png index 438e4afa3e..950976fe88 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png index bec0de11a4..8291c0c0c8 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png index 846b545cf0..60babff4f3 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png index 6b07d89cbb..eb30a5e1fe 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png index 350dfa5b3f..9bb264e1bd 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png and b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_off.png b/indra/newview/skins/default/textures/widgets/buy_off.png index 2eb8f1f41d..4cf12056e6 100644 Binary files a/indra/newview/skins/default/textures/widgets/buy_off.png and b/indra/newview/skins/default/textures/widgets/buy_off.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_over.png b/indra/newview/skins/default/textures/widgets/buy_over.png index 0820a4db89..ad5e2e2a08 100644 Binary files a/indra/newview/skins/default/textures/widgets/buy_over.png and b/indra/newview/skins/default/textures/widgets/buy_over.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_press.png b/indra/newview/skins/default/textures/widgets/buy_press.png index 26c13fa7e3..788bb3312e 100644 Binary files a/indra/newview/skins/default/textures/widgets/buy_press.png and b/indra/newview/skins/default/textures/widgets/buy_press.png differ diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index efeac923e3..07036db443 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -118,7 +118,7 @@ +