diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index d3634522044d6de18c5510cd2f2c7b855373d3d2..c5d6f885d344900152b95eb64ce3846ac0ff129e 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 0bc2b44ad5baf46177e46f4b1cb38df088a6211f..efe26d3887538edf6b87874ef155242b296160a8 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 6255f7ed1518b53a955b0b3fbc3606dce2b0eef8..69a8424e8729a38364ecfabe7421698f1e638cbc 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"); 
 	}
-*/
 }
diff --git a/install.xml b/install.xml
index efcfe9420ce7e313aaa281f72cc67df4de400eb7..c76217426ca01450bf5c5f42779e9b468225099b 100644
--- a/install.xml
+++ b/install.xml
@@ -214,9 +214,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>4f05166629caa4c132a7448eefb8d592</string>
+            <string>6746ae9fd9aff98b15f7b9f0f40334ab</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20090917.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091204.tar.bz2</uri>
           </map>
         </map>
       </map>