diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_search.xml | 18 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 20 | ||||
| -rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 17 |
3 files changed, 33 insertions, 22 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index d363452204..c5d6f885d3 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - legacy_header_height="18" + legacy_header_height="13" can_resize="true" - height="512" + height="646" layout="topleft" min_height="140" min_width="467" @@ -11,7 +11,7 @@ save_rect="true" single_instance="true" title="FIND" - width="620"> + width="670"> <floater.string name="search_url"> http://eniac21.lindenlab.com:10001/viewer @@ -25,21 +25,20 @@ Done </floater.string> <layout_stack - bottom="512" + bottom="641" follows="left|right|top|bottom" layout="topleft" left="10" name="stack1" top="20" - width="600"> + width="650"> <layout_panel - height="12" layout="topleft" left_delta="0" - name="external_controls" top_delta="0" + name="browser_layout" user_resize="false" - width="570"> + width="650"> <web_browser bottom="-10" follows="left|right|top|bottom" @@ -48,7 +47,8 @@ name="browser" top="0" start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E" - width="570" /> + height="600" + width="650" /> <text follows="bottom|left" height="16" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 0bc2b44ad5..efe26d3887 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -75,16 +75,6 @@ tool_tip="[SECOND_LIFE] Last Name" top_delta="0" width="135" /> - <combo_box - allow_text_entry="true" - font="SansSerifSmall" - follows="left|bottom" - height="23" - layout="topleft" - top="60" - name="server_combo" - width="135" - visible="false" /> <text follows="left|bottom" font="SansSerifSmall" @@ -161,6 +151,16 @@ name="Typeregionname" value="" /> </combo_box> + <combo_box + allow_text_entry="true" + font="SansSerifSmall" + follows="right|bottom" + height="23" + layout="topleft" + top_pad="2" + name="server_combo" + width="135" + visible="false" /> <text follows="right|bottom" font="SansSerifSmall" diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index 6255f7ed15..69a8424e87 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -29,6 +29,20 @@ #include "llevents.h" #include "stringize.h" +#if LL_WINDOWS +#define skipwin(arg) skip(arg) +#define skipmac(arg) +#define skiplinux(arg) +#elif LL_DARWIN +#define skipwin(arg) +#define skipmac(arg) skip(arg) +#define skiplinux(arg) +#elif LL_LINUX +#define skipwin(arg) +#define skipmac(arg) +#define skiplinux(arg) skip(arg) +#endif + /***************************************************************************** * Helper classes *****************************************************************************/ @@ -231,7 +245,6 @@ namespace tut ensure_equals("Online state", listener.lastEvent()["state"].asString(), "online"); } - /* template<> template<> void llviewerlogin_object::test<2>() { @@ -417,7 +430,6 @@ namespace tut ensure_equals("Failed to offline", listener.lastEvent()["state"].asString(), "offline"); } - *FIX:Mani Disabled unit boost::coro is patched template<> template<> void llviewerlogin_object::test<5>() { @@ -453,5 +465,4 @@ namespace tut ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login"); } -*/ } |