3 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6cb667a..b59b799 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-09-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * Removed 'Set Default' button from grid manager floater.
+
+          modified:   linden/indra/newview/floaterlogin.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+
+
         * Made HippoGridManager's sanitation code more sane.
 
           modified:   linden/indra/newview/floaterlogin.cpp
diff --git a/linden/indra/newview/floaterlogin.cpp b/linden/indra/newview/floaterlogin.cpp
index e393603..f1afc53 100644
--- a/linden/indra/newview/floaterlogin.cpp
+++ b/linden/indra/newview/floaterlogin.cpp
@@ -123,11 +123,10 @@ BOOL LoginFloater::postBuild()
         childSetAction("btn_copy", onClickCopy, this);
         childSetAction("btn_ok", onClickOk, this);
         childSetAction("btn_apply", onClickApply, this);
-        childSetAction("set_default", onClickDefault, this);
+        // childSetAction("set_default", onClickDefault, this);
         childSetAction("btn_cancel", onClickCancel, this);
-//KOW   childSetAction("set_default", onClickDefault, this);
         childSetAction("btn_gridinfo", onClickGridInfo, this);
-//KOW   childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this);
+        // childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this);
 
         childSetCommitCallback("grid_selector", onSelectGrid, this);
 //KOW   childSetCommitCallback("platform", onSelectPlatform, this);
@@ -177,11 +176,11 @@ void LoginFloater::refresh_grids()
                 //grids->setLabel(LLStringExplicit(""));  // LLComboBox::removeall() does not clear the label
         }
                         
-        sInstance->childSetTextArg("default_grid", "[DEFAULT]", (defaultGrid != "")? defaultGrid: " ");
+        // sInstance->childSetTextArg("default_grid", "[DEFAULT]", (defaultGrid != "")? defaultGrid: " ");
 
         sInstance->childSetEnabled("btn_delete", (selectIndex >= 0));
         sInstance->childSetEnabled("btn_copy", (sInstance->mState == NORMAL) && (selectIndex >= 0));
-        sInstance->childSetEnabled("set_default", (sInstance->mState == NORMAL) && (selectIndex > 0));
+        // sInstance->childSetEnabled("set_default", (sInstance->mState == NORMAL) && (selectIndex > 0));
         sInstance->childSetEnabled("gridnick", (sInstance->mState == ADD_NEW) || (sInstance->mState == ADD_COPY));
 
         if (sInstance->mState == NORMAL) {
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_login.xml b/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
index 8116213..6cf671c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
@@ -240,10 +240,13 @@
 
   <!-- Cancel/Connect Buttons -->
 
+  <!--
   <button bottom="-44" follows="right|top" font="SansSerif" halign="center"
              height="24" label="Set as Default" label_selected="Set as Default"
              left="470" mouse_opaque="true" name="set_default" scale_image="TRUE"
              width="110" />
+  -->
+
   <!-- <button bottom="28" follows="right|bottom" font="SansSerif" halign="center"
              height="24" label="Connect" label_selected="Connect"
              left="280" mouse_opaque="true" name="connect_btn" scale_image="TRUE"