Updated Grid Manager from Meerkat's SVN (as of r215).

1 files changed, 119 insertions, 229 deletions

diff --git a/linden/indra/newview/floaterlogin.cpp b/linden/indra/newview/floaterlogin.cpp
index b943c4e..6519962 100644
--- a/linden/indra/newview/floaterlogin.cpp
+++ b/linden/indra/newview/floaterlogin.cpp
@@ -1,9 +1,7 @@
 /*
- *  floaterlogin.cpp
- *  SecondLife
- *
- *  Created by RMS on 7/15/08.
- *
+ *  floaterlogin.cpp (floatergridmanager.cpp pls)
+ *  This is Meerkats grid manager, and I accidentally finished it with the wrong name :)
+ *  -Patrick Sapinski (Monday, August 17, 2009)
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -16,7 +14,6 @@
 #include "llmd5.h"
 #include "llurlsimstring.h"
 #include "lluictrlfactory.h"
-#include "controllerlogin.h"
 #include "floaterlogin.h"
 #include "hippoGridManager.h"
 #include "llviewernetwork.h"
@@ -26,13 +23,11 @@
 
 LoginFloater* LoginFloater::sInstance = NULL;
 LoginController* LoginFloater::sController = NULL;
-AuthenticationModel* LoginFloater::sModel = NULL;
 bool LoginFloater::sIsInitialLogin;
 std::string LoginFloater::sGrid;
 
-LoginFloater::LoginFloater(void (*callback)(S32 option, void* user_data),
-                                                   void *cb_data)
-:       LLFloater("floater_login"), mCallback(callback), mCallbackData(cb_data)
+LoginFloater::LoginFloater()
+:       LLFloater("floater_login")
 {
         
         mState = NORMAL;
@@ -56,7 +51,7 @@ LoginFloater::LoginFloater(void (*callback)(S32 option, void* user_data),
         }
         
         center();
-        LLLineEditor* edit = getChild<LLLineEditor>("password_edit");
+        LLLineEditor* edit = getChild<LLLineEditor>("avatar_password_edit");
         if (edit) edit->setDrawAsterixes(TRUE);
         LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
         combo->setAllowTextEntry(TRUE, 128, FALSE);
@@ -79,34 +74,11 @@ LoginFloater::LoginFloater(void (*callback)(S32 option, void* user_data),
         {
                 combo->setCurrentByIndex( 0 );
         }
-        
-        LLTextBox* version_text = getChild<LLTextBox>("version_text");
-        std::string version = llformat("%d.%d.%d (%d)",
-                                                                   LL_VERSION_MAJOR,
-                                                                   LL_VERSION_MINOR,
-                                                                   LL_VERSION_PATCH,
-                                                                   LL_VIEWER_BUILD );
-        version_text->setText(version);
-        
-        LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-        channel_text->setText(gSavedSettings.getString("VersionChannelName"));
-        
-        sendChildToBack(getChildView("channel_text"));
-        sendChildToBack(getChildView("version_text"));
-        sendChildToBack(getChildView("forgot_password_text"));
-        
-        setDefaultBtn("connect_btn");
-        
-
-
 }
 
 
 LoginFloater::~LoginFloater()
 {
-        delete LoginFloater::sController;
-        
-        LoginFloater::sModel = NULL;
         LoginFloater::sController = NULL;
         LoginFloater::sInstance = NULL;
 }
@@ -122,17 +94,19 @@ void LoginFloater::close()
 
 BOOL LoginFloater::postBuild()
 {
-        requires<LLComboBox>("grid_selector");
+        requires<LLScrollListCtrl>("grid_selector");
         requires<LLLineEditor>("gridnick");
-        requires<LLComboBox>("platform");
         requires<LLLineEditor>("gridname");
         requires<LLLineEditor>("loginuri");
         requires<LLLineEditor>("loginpage");
         requires<LLLineEditor>("helperuri");
         requires<LLLineEditor>("website");
+        requires<LLLineEditor>("support");
+        requires<LLLineEditor>("register");
+        requires<LLLineEditor>("password");
         requires<LLLineEditor>("first_name");
         requires<LLLineEditor>("last_name");
-        requires<LLLineEditor>("password");
+        requires<LLLineEditor>("avatar_password");
         //requires<LLLineEditor>("search");
         requires<LLButton>("btn_delete");
         requires<LLButton>("btn_add");
@@ -141,17 +115,18 @@ BOOL LoginFloater::postBuild()
         requires<LLButton>("btn_gridinfo");
         requires<LLButton>("btn_help_render_compat");
         if (!checkRequirements()) return false;
-        LLLineEditor* password_edit = getChild<LLLineEditor>("password");
+        LLLineEditor* password_edit = getChild<LLLineEditor>("avatar_password");
         if (password_edit) password_edit->setDrawAsterixes(TRUE);
 
         childSetAction("btn_delete", onClickDelete, this);
         childSetAction("btn_add", onClickAdd, this);
         childSetAction("btn_copy", onClickCopy, this);
+        childSetAction("btn_ok", onClickOk, this);
         childSetAction("btn_apply", onClickApply, this);
         childSetAction("set_default", onClickDefault, this);
         childSetAction("btn_cancel", onClickCancel, this);
 //KOW   childSetAction("set_default", onClickDefault, this);
-//KOW   childSetAction("btn_gridinfo", onClickGridInfo, this);
+        childSetAction("btn_gridinfo", onClickGridInfo, this);
 //KOW   childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this);
 
         childSetCommitCallback("grid_selector", onSelectGrid, this);
@@ -209,29 +184,24 @@ void LoginFloater::refresh_grids()
         sInstance->childSetEnabled("set_default", (sInstance->mState == NORMAL) && (selectIndex > 0));
         sInstance->childSetEnabled("gridnick", (sInstance->mState == ADD_NEW) || (sInstance->mState == ADD_COPY));
 
-
-        LLComboBox *platform = sInstance->getChild<LLComboBox>("platform");
-        platform->removeall();
-        for (int p=HippoGridInfo::PLATFORM_OTHER; p<HippoGridInfo::PLATFORM_LAST; p++)
-                platform->add(HippoGridInfo::getPlatformString(static_cast<HippoGridInfo::Platform>(p)));
-
-
         if (sInstance->mState == NORMAL) {
                 HippoGridInfo *gridInfo = gHippoGridManager->getGrid(sInstance->mCurGrid);
                 if (gridInfo) {
                         sInstance->childSetText("gridnick", gridInfo->getGridNick());
-                        platform->setCurrentByIndex(gridInfo->getPlatform());
                         //sInstance->childSetText("grid_name", gridInfo->getGridName());
                         sInstance->childSetText("loginuri", gridInfo->getLoginUri());
                         sInstance->childSetText("loginpage", gridInfo->getLoginPage());
                         sInstance->childSetText("helperuri", gridInfo->getHelperUri());
                         sInstance->childSetText("website", gridInfo->getWebSite());
+                        sInstance->childSetText("support", gridInfo->getSupportUrl());
+            sInstance->childSetText("register", gridInfo->getRegisterUrl());
+            sInstance->childSetText("password", gridInfo->getPasswordUrl());
                         sInstance->childSetText("first_name", gridInfo->getFirstName());
                         sInstance->childSetText("last_name", gridInfo->getLastName());
                         if(gridInfo->getAvatarPassword().length() == 32)
-                                sInstance->childSetText("password", std::string(PASSWORD_FILLER));
+                                sInstance->childSetText("avatar_password", std::string(PASSWORD_FILLER));
                         else if(gridInfo->getPasswordUrl().empty())
-                                sInstance->childSetText("password", std::string(""));
+                                sInstance->childSetText("avatar_password", std::string(""));
 /*
             if (gridInfo->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
                             //childSetEnabled("search", false);
@@ -248,7 +218,6 @@ void LoginFloater::refresh_grids()
                 }       else {
                         std::string empty = "";
                         sInstance->childSetText("gridnick", empty);
-                        platform->setCurrentByIndex(HippoGridInfo::PLATFORM_OTHER);
                         sInstance->childSetText("gridname", empty);
                         sInstance->childSetText("loginuri", empty);
                         sInstance->childSetText("loginpage", empty);
@@ -256,28 +225,26 @@ void LoginFloater::refresh_grids()
                         sInstance->childSetText("website", empty);
                         sInstance->childSetText("first_name", empty);
                         sInstance->childSetText("last_name", empty);
-                        sInstance->childSetText("password", empty);
-                        sInstance->childSetEnabled("render_compat", true);
-                        sInstance->childSetValue("render_compat", true);
+                        sInstance->childSetText("avatar_password", empty);
                 }
         } else if (sInstance->mState == ADD_NEW) {
                         llwarns << "ADD_NEW" << llendl;
                 std::string required = "<required>";
                 std::string empty = "";
                 sInstance->childSetText("gridnick", required);
-                platform->setCurrentByIndex(HippoGridInfo::PLATFORM_OTHER);
                 sInstance->childSetText("gridname", empty);
                 sInstance->childSetText("loginuri", required);
                 sInstance->childSetText("loginpage", empty);
                 sInstance->childSetText("helperuri", empty);
                 sInstance->childSetText("website", empty);
+                sInstance->childSetText("support", empty);
+                sInstance->childSetText("register", empty);
+                sInstance->childSetText("password", empty);
                 sInstance->childSetText("first_name", empty);
                 sInstance->childSetText("last_name", empty);
-                sInstance->childSetText("password", empty);
+                sInstance->childSetText("avatar_password", empty);
                 //childSetEnabled("search", true);
                 //childSetText("search", empty);
-                sInstance->childSetEnabled("render_compat", true);
-                sInstance->childSetValue("render_compat", true);
         } else if (sInstance->mState == ADD_COPY) {
                         llwarns << "ADD_COPY" << llendl;
                 sInstance->childSetText("gridnick", LLStringExplicit("<required>"));
@@ -302,29 +269,32 @@ void LoginFloater::applyChanges()
         {
                 if (gridInfo->getGridNick() == childGetValue("gridnick").asString()) 
                 {
-                        gridInfo->setPlatform(childGetValue("platform"));
                         gridInfo->setGridName(childGetValue("gridname"));
                         gridInfo->setLoginUri(childGetValue("loginuri"));
                         gridInfo->setLoginPage(childGetValue("loginpage"));
                         gridInfo->setHelperUri(childGetValue("helperuri"));
                         gridInfo->setWebSite(childGetValue("website"));
+                        gridInfo->setSupportUrl(childGetValue("support"));
+            gridInfo->setRegisterUrl(childGetValue("register"));
+                        gridInfo->setPasswordUrl(childGetValue("password"));
                         gridInfo->setFirstName(childGetValue("first_name"));
                         gridInfo->setLastName(childGetValue("last_name"));
                         //gridInfo->setSearchUrl(childGetValue("search"));
                         gridInfo->setRenderCompat(childGetValue("render_compat"));
                         
-                        if(childGetValue("password").asString().empty())
-                                gridInfo->setPasswordUrl(std::string(""));
-                        else if(childGetValue("password").asString() != std::string(PASSWORD_FILLER))
+                        if(childGetValue("avatar_password").asString().empty())
+                                gridInfo->setAvatarPassword(std::string(""));
+                        else if(childGetValue("avatar_password").asString() != std::string(PASSWORD_FILLER))
                         {
                                 // store account authentication data
-                                std::string auth_password = childGetValue("password");
+                                std::string auth_password = childGetValue("avatar_password");
                                 std::string hashed_password;
                                 hashPassword(auth_password, hashed_password);
                                 gridInfo->setAvatarPassword(hashed_password);
                         }
-                        LLPanelLogin::setFields(gridInfo->getFirstName(), gridInfo->getLastName(),
-                                                                        gridInfo->getAvatarPassword(), true);
+                        //this bug was a feature -Patrick Sapinski (Friday, August 21, 2009)
+                        //LLPanelLogin::setFields(gridInfo->getFirstName(), gridInfo->getLastName(),
+                        //                                              gridInfo->getAvatarPassword(), true);
                 } 
                 else 
                 {
@@ -363,24 +333,26 @@ bool LoginFloater::createNewGrid()
 
         // create new grid
         HippoGridInfo *grid = new HippoGridInfo(gridnick);
-        grid->setPlatform(childGetValue("platform"));
         grid->setGridName(childGetValue("gridname"));
         grid->setLoginUri(loginuri);
         grid->setLoginPage(childGetValue("loginpage"));
         grid->setHelperUri(childGetValue("helperuri"));
         grid->setWebSite(childGetValue("website"));
+        grid->setSupportUrl(childGetValue("support"));
+    grid->setRegisterUrl(childGetValue("register"));
+        grid->setPasswordUrl(childGetValue("password"));
         grid->setFirstName(childGetValue("first_name"));
         grid->setLastName(childGetValue("last_name"));
         //grid->setSearchUrl(childGetValue("search"));
         grid->setRenderCompat(childGetValue("render_compat"));
         gHippoGridManager->addGrid(grid);
         
-        if(childGetValue("password").asString().empty())
+        if(childGetValue("avatar_password").asString().empty())
                 grid->setAvatarPassword(std::string(""));
         else
         {
                 std::string hashed_password;
-                hashPassword(childGetValue("password"), hashed_password);
+                hashPassword(childGetValue("avatar_password"), hashed_password);
                 grid->setAvatarPassword(hashed_password);
         }
         
@@ -388,6 +360,49 @@ bool LoginFloater::createNewGrid()
         return true;
 }
 
+void LoginFloater::retrieveGridInfo()
+{
+        std::string loginuri = childGetValue("loginuri");
+        if ((loginuri == "") || (loginuri == "<required>")) {
+                //KOW gViewerWindow->alertXml("GridInfoNoLoginUri");
+                return;
+        }
+
+        HippoGridInfo *grid = 0;
+        bool cleanupGrid = false;
+        if (mState == NORMAL) {
+                grid = gHippoGridManager->getGrid(mCurGrid);
+        } else if ((mState == ADD_NEW) || (mState == ADD_COPY)) {
+                grid = new HippoGridInfo("");
+                cleanupGrid = true;
+        } else {
+                llerrs << "Illegal state " << mState << '.' << llendl;
+                return;
+        }
+        if (!grid) {
+                llerrs << "Internal error retrieving grid info." << llendl;
+                return;
+        }
+
+        grid->setLoginUri(loginuri);
+        if (grid->retrieveGridInfo()) {
+                if (grid->getGridNick() != "") childSetText("gridnick", grid->getGridNick());
+                if (grid->getGridName() != "") childSetText("gridname", grid->getGridName());
+                if (grid->getLoginUri() != "") childSetText("loginuri", grid->getLoginUri());
+                if (grid->getLoginPage() != "") childSetText("loginpage", grid->getLoginPage());
+                if (grid->getHelperUri() != "") childSetText("helperuri", grid->getHelperUri());
+                if (grid->getWebSite() != "") childSetText("website", grid->getWebSite());
+        if (grid->getSupportUrl() != "") childSetText("support", grid->getSupportUrl());
+        if (grid->getRegisterUrl() != "") childSetText("register", grid->getRegisterUrl());
+                if (grid->getPasswordUrl() != "") childSetText("password", grid->getPasswordUrl());
+                //if (grid->getSearchUrl() != "") childSetText("search", grid->getSearchUrl());
+        } else {
+                //KOW gViewerWindow->alertXml("GridInfoError");
+        }
+
+        if (cleanupGrid) delete grid;
+}
+
 void LoginFloater::apply()
 {
         if (mState == NORMAL) {
@@ -417,8 +432,6 @@ void LoginFloater::setDefault()
         }
         gHippoGridManager->setCurrentGrid(mCurGrid);
         gHippoGridManager->setDefaultGrid(mCurGrid);
-                        llwarns << "I think me grid is " << mCurGrid << llendl;
-        //LLPanelLogin::refreshLoginPage();
         gHippoGridManager->saveFile();
         LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
 }
@@ -426,7 +439,6 @@ void LoginFloater::setDefault()
 void LoginFloater::cancel()
 {
         gHippoGridManager->discardAndReload();
-        LoginFloater::sModel->revert();
         update();
 }
 
@@ -439,14 +451,8 @@ void LoginFloater::onSelectGrid(LLUICtrl* ctrl, void *data)
                 if (self->createNewGrid()) {
                         self->mState = NORMAL;
                 } else {
-                        //LLCtrlListInterface *grids = self->childGetListInterface("search_results");
-                        //if (!grids) return;
-
-                        //LLSD selected_value = grids->getSelectedValue();
-                        //std::string sim_name = selected_value.asString();
-
-                        LLComboBox *grids = self->getChild<LLComboBox>("grid_selector");
-                        grids->setCurrentByIndex(grids->getItemCount() - 1);
+                        //LLScrollListCtrl *grids = self->getChild<LLScrollListCtrl>("grid_selector");
+                        //grids->setCurrentByIndex(grids->getItemCount() - 1);
                         return;
                 }
         } else {
@@ -454,8 +460,6 @@ void LoginFloater::onSelectGrid(LLUICtrl* ctrl, void *data)
                 return;
         }
         self->mCurGrid = ctrl->getValue().asString();
-                        llwarns << "I think me grid is " << self->mCurGrid << llendl;
-
         self->refresh_grids();
 }
 
@@ -488,16 +492,38 @@ void LoginFloater::onClickCopy(void *data)
         self->refresh_grids();
 }
 
+// static
+void LoginFloater::onClickOk(void* data)
+{
+        if(NULL==sInstance)
+                return;
+
+        sInstance->apply();
+        sInstance->close();
+}
+
 //static
 void LoginFloater::onClickApply(void *data)
 {
+        if(NULL==sInstance)
+                return;
+
         sInstance->apply();
+        refresh_grids();
 }
 
 //static
 void LoginFloater::onClickDefault(void *data)
 {
         sInstance->setDefault();
+        sInstance->refresh_grids();
+}
+
+//static
+void LoginFloater::onClickGridInfo(void *data)
+{
+        //HippoPanelGrids* self = (HippoPanelGrids*)data;
+        sInstance->retrieveGridInfo();
 }
 
 //static
@@ -542,64 +568,28 @@ void LoginFloater::refreshLocation( bool force_visible )
         sInstance->childSetVisible("server_combo", TRUE);
 }
 
-void LoginFloater::newShow(const std::string &grid, bool initialLogin,
-                                                void (*callback)(S32 option, void* user_data), 
-                                                void* callback_data)
+void LoginFloater::newShow(const std::string &grid, bool initialLogin)
 {
         
-                llwarns << "newShow called" << llendl;
+        llwarns << "newShow called" << llendl;
         if(NULL==sInstance) 
         {
                 LoginFloater::sGrid = grid;
                 LoginFloater::sIsInitialLogin = initialLogin;
-                sInstance = new LoginFloater(callback, callback_data);
+                sInstance = new LoginFloater();
                 
                 llwarns << "sInstance assigned. sInstance=" << sInstance << llendl;
         }
-        
-        // floater controller requires initialized floater and model
-        if(NULL==sModel)
-                sModel = AuthenticationModel::getInstance();
-        if(NULL==sController)
-                //sController = new LoginController(sInstance, sModel, sGrid);
-
-
-
-                llwarns << "newshow called" << llendl;
-                sInstance->mCurGrid = gHippoGridManager->getCurrentGridNick();
-                refresh_grids();
 
-                // we're important
-                sInstance->setFrontmost(TRUE);
-                sInstance->setFocus(TRUE);
-
-}
+        llwarns << "newshow called" << llendl;
+        sInstance->mCurGrid = gHippoGridManager->getCurrentGridNick();
+        refresh_grids();
 
-void LoginFloater::testShow(void *lies)
-{
-        // this is if we want to call LoginFloater from a menu option
-        // or you know whatever
-        newShow(std::string("Test"), false, testCallback, NULL);
-}
+                sInstance->open();      /*Flawfinder: ignore*/
+        // we're important
+        //sInstance->setFrontmost(TRUE);
+        //sInstance->setFocus(TRUE);
 
-void LoginFloater::testCallback(S32 option, void *user_data)
-{
-        // test callback, referenced by testShow()
-        if(LOGIN_OPTION_CONNECT == option)
-        {
-                llinfos << "this is how we connect to a METAVERSE" << llendl;
-                std::string first, last, password;
-                BOOL remember = TRUE;
-                getFields(first, last, password, remember);
-                llinfos << "first\t\tlast\t\tpassword" << llendl;
-                llinfos << first << "\t\t" << last << "\t\t" << password << llendl;
-        }
-        else if(LOGIN_OPTION_QUIT == option)
-        {
-                llinfos << "my login, she die" << llendl;
-                llinfos << ":(" << llendl;
-                close();
-        }
 }
 
 void LoginFloater::show(const LLRect &rect, BOOL show_server, 
@@ -608,7 +598,7 @@ void LoginFloater::show(const LLRect &rect, BOOL show_server,
 {
         // we don't need a grid passed in because this is old-style login
         std::string grid = "";
-        newShow(grid, TRUE, callback, callback_data);
+        newShow(grid, TRUE);
 }
 
 void LoginFloater::setFocus(BOOL b)
@@ -628,7 +618,7 @@ void LoginFloater::setFocus(BOOL b)
 
 void LoginFloater::giveFocus()
 {
-        LLComboBox *combo = NULL;
+        LLScrollListCtrl *combo = NULL;
         
         if(NULL==sInstance)
         {
@@ -638,91 +628,10 @@ void LoginFloater::giveFocus()
         
         // for our combo box approach, selecting the combo box is almost always
         // the right thing to do on the floater receiving focus
-        combo = sInstance->getChild<LLComboBox>("name_combo");
+        combo = sInstance->getChild<LLScrollListCtrl>("grid_selector");
         combo->setFocus(TRUE);
 }
 
-void LoginFloater::getFields(std::string &firstname, std::string &lastname, std::string &password,
-                                                         BOOL &remember)
-{
-        if (!sInstance)
-        {
-                llwarns << "Attempted getFields with no login view shown" << llendl;
-                return;
-        }
-        
-        std::string loginname = sInstance->childGetText("name_combo");
-        
-        LLStringUtil::replaceTabsWithSpaces(loginname, 1);
-        LLStringUtil::trim(loginname);
-        std::vector<std::string> loginVec;
-        boost::split(loginVec, loginname, boost::is_any_of(" "), boost::token_compress_on);
-        if(loginVec.size() == 2)
-        {
-                firstname = loginVec[0];
-                lastname = loginVec[1];
-        }
-        
-        password = sInstance->mMungedPassword;
-        remember = sInstance->childGetValue("remember_check");
-}
-
-void LoginFloater::getFields(std::string &loginname, std::string &password, BOOL &remember)
-{
-        std::string first, last, pass;
-        BOOL rem;
-        getFields(first, last, pass, rem);
-        loginname = first + " " + last;
-        password = pass;
-        remember = rem;
-}
-
-void LoginFloater::setFields(const std::string& firstname, const std::string& lastname, const std::string& password,
-                                                         BOOL remember)
-{
-        if (!sInstance)
-        {
-                llwarns << "Attempted setFields with no login view shown" << llendl;
-                return;
-        }
-        
-        std::string loginname = firstname + " " + lastname;
-        sInstance->childSetText("name_combo", loginname);
-        
-        // Max "actual" password length is 16 characters.
-        // Hex digests are always 32 characters.
-        if (password.length() == 32)
-        {
-                // This is a MD5 hex digest of a password.
-                // We don't actually use the password input field, 
-                // fill it with MAX_PASSWORD characters so we get a 
-                // nice row of asterixes.
-                const std::string filler("123456789!123456");
-                sInstance->childSetText("password_edit", filler);
-                sInstance->mIncomingPassword = filler;
-                sInstance->mMungedPassword = password;
-        }
-        else
-        {
-                // this is a normal text password
-                sInstance->childSetText("password_edit", password);
-                sInstance->mIncomingPassword = password;
-                LLMD5 pass((unsigned char *)password.c_str());
-                char munged_password[MD5HEX_STR_SIZE];
-                pass.hex_digest(munged_password);
-                sInstance->mMungedPassword = munged_password;
-        }
-        
-        sInstance->childSetValue("remember_check", remember);
-}
-
-void LoginFloater::setFields(const std::string &loginname, const std::string &password, BOOL remember)
-{
-        std::vector<std::string> loginVec;
-        boost::split(loginVec, loginname, boost::is_any_of(" "), boost::token_compress_on);
-        setFields(loginVec[0], loginVec[1], password, remember);
-}
-
 BOOL LoginFloater::isGridComboDirty()
 {
         BOOL user_picked = FALSE;
@@ -778,25 +687,6 @@ void LoginFloater::addServer(const std::string& server, S32 domain_name)
         combo->setCurrentByIndex(0);
 }
 
-void LoginFloater::accept()
-{
-        if(NULL==sInstance || NULL==sInstance->mCallback)
-                return;
-        
-        sInstance->setFocus(FALSE);
-        
-        std::string name_combo = sInstance->childGetText("name_combo");
-        if(!name_combo.empty())
-        {
-                sInstance->mCallback(LOGIN_OPTION_CONNECT, sInstance->mCallbackData);
-        }
-        else
-        {
-                // TODO: new account call goes here
-                return;
-        }
-}
-
 void LoginFloater::cancel_old()
 {
         if(NULL==sInstance)