1 files changed, 9 insertions, 54 deletions

diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 6c5823c..881629e 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2008, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,21 +29,9 @@
  * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */
-
 #ifndef LL_LLVIEWERNETWORK_H
 #define LL_LLVIEWERNETWORK_H
 
-class LLHost;
-
-enum EGridInfo
-{
-        GRID_INFO_NONE,
-        GRID_INFO_AGNI,
-        GRID_INFO_ADITI,
-        GRID_INFO_LOCAL,
-        GRID_INFO_OTHER, // IP address set via command line option
-        GRID_INFO_COUNT
-};
 
 /**
  * @brief A class to manage the viewer's login state.
@@ -52,53 +40,20 @@ enum EGridInfo
 class LLViewerLogin : public LLSingleton<LLViewerLogin>
 {
 public:
-        LLViewerLogin();
-
-        void setGridChoice(EGridInfo grid);
-        void setGridChoice(const std::string& grid_name);
-        void resetURIs();
-
-        /**
-        * @brief Get the enumeration of the grid choice.
-        * Should only return values > 0 && < GRID_INFO_COUNT
-        **/
-        EGridInfo getGridChoice() const;
-
-        /**
-        * @brief Get a readable label for the grid choice.
-        * Returns the readable name for the grid choice. 
-        * If the grid is 'other', returns something
-        * the string used to specifiy the grid.
-        **/
-        std::string getGridLabel() const; 
-
-  /**
-   * @brief Get the code name for the grid choice.
-   *
-   * Returns the code name for the grid choice, as designated
-   * by Linden Lab. The SL main grid is Agni, and the beta
-   * grid is Aditi. There are other LL testing grids with code
-   * names, but we don't care about those.
-   *
-   * This string is used primarily for fetching the proper
-   * login splash page, since the web server expects "Agni"
-   * and "Aditi", not "SL Main Grid" and "SL Beta Grid".
-   */
-        std::string getGridCodeName() const; 
-
-        std::string getKnownGridLabel(EGridInfo grid_index) const; 
-
         void getLoginURIs(std::vector<std::string>& uris) const;
-        std::string getHelperURI() const;
+        const std::string &getGridLabel() const; 
+        const std::string &getLoginPage() const;
+        const std::string &getHelperURI() const;
 
-        bool isInProductionGrid();
+        bool isOpenSimulator();
+        bool isSecondLife();
 
-private:
-        EGridInfo mGridChoice;
-        std::string mGridName;
+        bool isInProductionGrid();
 };
 
+
 const S32 MAC_ADDRESS_BYTES = 6;
 extern unsigned char gMACAddress[MAC_ADDRESS_BYTES];            /* Flawfinder: ignore */
 
+
 #endif