diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index da1765eba2..fe1944fd31 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -88,7 +88,7 @@ follows="left|right|bottom" font="SansSerifSmall" height="20" - label="In Progress" + label="To local chat" layout="bottomleft" name="chat_box" tab_group="3" diff --git a/indra/newview/skins/firestorm/colors.xml b/indra/newview/skins/firestorm/colors.xml index c21da8891e..a638a7118b 100644 --- a/indra/newview/skins/firestorm/colors.xml +++ b/indra/newview/skins/firestorm/colors.xml @@ -10,6 +10,18 @@ var. 5 = #AB7B61 = rgb(171,123,97) 0.76 0.58 0.49 --> + + + + @@ -359,10 +371,10 @@ + reference="White" /> + reference="White" /> @@ -374,7 +386,7 @@ reference="White_25" /> + reference="DkGray" /> @@ -389,7 +401,7 @@ reference="DkGray_66" /> + reference="White_25" /> diff --git a/indra/newview/skins/firestorm/themes/grey/colors.xml b/indra/newview/skins/firestorm/themes/grey/colors.xml index c21da8891e..93836af346 100644 --- a/indra/newview/skins/firestorm/themes/grey/colors.xml +++ b/indra/newview/skins/firestorm/themes/grey/colors.xml @@ -10,6 +10,18 @@ var. 5 = #AB7B61 = rgb(171,123,97) 0.76 0.58 0.49 --> + + + + diff --git a/indra/newview/skins/firestorm/xui/en/main_view.xml b/indra/newview/skins/firestorm/xui/en/main_view.xml deleted file mode 100644 index 56da0d59fb..0000000000 --- a/indra/newview/skins/firestorm/xui/en/main_view.xml +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/indra/newview/skins/firestorm/xui/en/menu_viewer.xml b/indra/newview/skins/firestorm/xui/en/menu_viewer.xml new file mode 100644 index 0000000000..905e151278 --- /dev/null +++ b/indra/newview/skins/firestorm/xui/en/menu_viewer.xml @@ -0,0 +1,3705 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml index 63068a069f..288b1a8706 100644 --- a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml @@ -1,8 +1,8 @@ + + + + + + + + 6 + + + + + + + + + + + diff --git a/indra/newview/skins/firestorm/xui/en/panel_navigation_bar.xml b/indra/newview/skins/firestorm/xui/en/panel_navigation_bar.xml deleted file mode 100644 index 25275d934b..0000000000 --- a/indra/newview/skins/firestorm/xui/en/panel_navigation_bar.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - -