aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/floaterlogin.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-09-25 23:34:49 -0500
committerJacek Antonelli2009-09-25 23:34:49 -0500
commitc5eab75ec34a11b1de0933b3d129b099ea557b65 (patch)
tree4230a7712382625567eb188aaf4065e57bb33c3d /linden/indra/newview/floaterlogin.cpp
parentMade HippoGridManager's sanitation code more sane. (diff)
downloadmeta-impy-c5eab75ec34a11b1de0933b3d129b099ea557b65.zip
meta-impy-c5eab75ec34a11b1de0933b3d129b099ea557b65.tar.gz
meta-impy-c5eab75ec34a11b1de0933b3d129b099ea557b65.tar.bz2
meta-impy-c5eab75ec34a11b1de0933b3d129b099ea557b65.tar.xz
Removed 'Set Default' button from grid manager floater.
Diffstat (limited to 'linden/indra/newview/floaterlogin.cpp')
-rw-r--r--linden/indra/newview/floaterlogin.cpp9
1 files changed, 4 insertions, 5 deletions
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()
123 childSetAction("btn_copy", onClickCopy, this); 123 childSetAction("btn_copy", onClickCopy, this);
124 childSetAction("btn_ok", onClickOk, this); 124 childSetAction("btn_ok", onClickOk, this);
125 childSetAction("btn_apply", onClickApply, this); 125 childSetAction("btn_apply", onClickApply, this);
126 childSetAction("set_default", onClickDefault, this); 126 // childSetAction("set_default", onClickDefault, this);
127 childSetAction("btn_cancel", onClickCancel, this); 127 childSetAction("btn_cancel", onClickCancel, this);
128//KOW childSetAction("set_default", onClickDefault, this);
129 childSetAction("btn_gridinfo", onClickGridInfo, this); 128 childSetAction("btn_gridinfo", onClickGridInfo, this);
130//KOW childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this); 129 // childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this);
131 130
132 childSetCommitCallback("grid_selector", onSelectGrid, this); 131 childSetCommitCallback("grid_selector", onSelectGrid, this);
133//KOW childSetCommitCallback("platform", onSelectPlatform, this); 132//KOW childSetCommitCallback("platform", onSelectPlatform, this);
@@ -177,11 +176,11 @@ void LoginFloater::refresh_grids()
177 //grids->setLabel(LLStringExplicit("")); // LLComboBox::removeall() does not clear the label 176 //grids->setLabel(LLStringExplicit("")); // LLComboBox::removeall() does not clear the label
178 } 177 }
179 178
180 sInstance->childSetTextArg("default_grid", "[DEFAULT]", (defaultGrid != "")? defaultGrid: " "); 179 // sInstance->childSetTextArg("default_grid", "[DEFAULT]", (defaultGrid != "")? defaultGrid: " ");
181 180
182 sInstance->childSetEnabled("btn_delete", (selectIndex >= 0)); 181 sInstance->childSetEnabled("btn_delete", (selectIndex >= 0));
183 sInstance->childSetEnabled("btn_copy", (sInstance->mState == NORMAL) && (selectIndex >= 0)); 182 sInstance->childSetEnabled("btn_copy", (sInstance->mState == NORMAL) && (selectIndex >= 0));
184 sInstance->childSetEnabled("set_default", (sInstance->mState == NORMAL) && (selectIndex > 0)); 183 // sInstance->childSetEnabled("set_default", (sInstance->mState == NORMAL) && (selectIndex > 0));
185 sInstance->childSetEnabled("gridnick", (sInstance->mState == ADD_NEW) || (sInstance->mState == ADD_COPY)); 184 sInstance->childSetEnabled("gridnick", (sInstance->mState == ADD_NEW) || (sInstance->mState == ADD_COPY));
186 185
187 if (sInstance->mState == NORMAL) { 186 if (sInstance->mState == NORMAL) {