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

1 files changed, 9 insertions, 17 deletions

diff --git a/linden/indra/newview/floaterlogin.h b/linden/indra/newview/floaterlogin.h
index 1800897..cdb60b0 100644
--- a/linden/indra/newview/floaterlogin.h
+++ b/linden/indra/newview/floaterlogin.h
@@ -1,10 +1,9 @@
 /*
- *  floaterlogin.h
- *  SecondLife
- *
- *  Created by RMS on 7/15/08.
- *
+ *  floaterlogin.h (floatergridmanager.h pls)
+ *  This is Meerkats grid manager, and I accidentally finished it with the wrong name :)
+ *  -Patrick Sapinski (Monday, August 17, 2009)
  */
+
 #ifndef PL_floaterlogin_H
 #define PL_floaterlogin_H
 
@@ -19,8 +18,7 @@ class AuthenticationModel;
 class LoginFloater : public LLFloater
 {
 public:
-        LoginFloater(void (*callback)(S32 option, void *user_data),
-                                 void *callback_data);
+        LoginFloater();
         virtual ~LoginFloater();
         
         virtual BOOL postBuild();
@@ -31,11 +29,7 @@ public:
         void cancel();
 
         // new-style login methods
-        static void newShow(const std::string &grid, bool initialLogin,
-                                         void (*callback)(S32 option, void *user_data), 
-                                         void *callback_data);
-        static void testShow(void *lies);
-        static void testCallback(S32 option, void *user_data);
+        static void newShow(const std::string &grid, bool initialLogin);
         virtual std::string& getPassword();
         virtual void setPassword(std::string &password);
         virtual bool isSamePassword(std::string &password);
@@ -54,14 +48,9 @@ public:
         static void refreshLocation(bool force_visible);
         virtual void setFocus(BOOL b);
         static void giveFocus();
-        static void getFields(std::string& firstname, std::string& lastname,
-                                                  std::string& password, BOOL& remember);
-        static void setFields(const std::string& firstname, const std::string &lastname,
-                                                  const std::string& password, BOOL remember);
         static void getLocation(std::string &location);
         static BOOL isGridComboDirty();
         static void addServer(const std::string& server, S32 domain_name);
-        static void accept();
         static void cancel_old();
         static void hashPassword(const std::string& password, std::string& hashedPassword);
 protected:
@@ -78,13 +67,16 @@ private:
         void applyChanges();
         bool createNewGrid();
         void update();
+        void retrieveGridInfo();
 
         static void onSelectGrid(LLUICtrl *ctrl, void *data);
         static void onClickDelete(void *data);
         static void onClickAdd(void *data);
         static void onClickCopy(void *data);
+        static void onClickOk(void *data);
         static void onClickApply(void *data);
         static void onClickDefault(void *data);
+        static void onClickGridInfo(void *data);
         static void onClickCancel(void *data);
 
         static LoginFloater *sInstance;