Fixed Bug #262: 'Help > Viewer Help' name does not match behavior (also fixed LLWeb::loadURL)

1 files changed, 33 insertions, 32 deletions

diff --git a/linden/indra/newview/hippoGridManager.h b/linden/indra/newview/hippoGridManager.h
index b304722..5ad6ca2 100644
--- a/linden/indra/newview/hippoGridManager.h
+++ b/linden/indra/newview/hippoGridManager.h
@@ -33,7 +33,7 @@ public:
                 SEARCH_ALL_TEMPLATE
         };
 
-        explicit HippoGridInfo(const std::string &gridNick);
+        explicit HippoGridInfo(const std::string& gridNick);
 
         Platform           getPlatform();
         bool isOpenSimulator() const;
@@ -51,7 +51,7 @@ public:
         const std::string& getFirstName()       const;
         const std::string& getLastName()        const;
         const std::string& getAvatarPassword()  const;
-        const std::string &getVoiceConnector()  const { return mVoiceConnector; }
+        const std::string& getVoiceConnector()  const { return mVoiceConnector; }
         std::string getSearchUrl(SearchType ty, bool is_web) const;
         bool isRenderCompat()                   const;
         int getMaxAgentGroups() const { return mMaxAgentGroups; }
@@ -62,31 +62,31 @@ public:
         std::string getGroupCreationFee()          const;
         std::string getDirectoryFee()              const;
 
-        void setPlatform (const std::string &platform);
+        void setPlatform (const std::string& platform);
         void setPlatform (Platform platform);
-        void setGridName (const std::string &gridName);
-        void setLoginUri (const std::string &loginUri);
-        void setLoginPage(const std::string &loginPage);
-        void setHelperUri(const std::string &helperUri);
-        void setWebSite  (const std::string &website);
-        void setSupportUrl(const std::string &url);
-        void setRegisterUrl(const std::string &url);
-        void setPasswordUrl(const std::string &url);
-        void setSearchUrl(const std::string &url);
+        void setGridName (const std::string& gridName);
+        void setLoginUri (const std::string& loginUri);
+        void setLoginPage(const std::string& loginPage);
+        void setHelperUri(const std::string& helperUri);
+        void setWebSite  (const std::string& website);
+        void setSupportUrl(const std::string& url);
+        void setRegisterUrl(const std::string& url);
+        void setPasswordUrl(const std::string& url);
+        void setSearchUrl(const std::string& url);
         void setRenderCompat(bool compat);
         void setMaxAgentGroups(int max)                   { mMaxAgentGroups = max;   }
-        void setFirstName(const std::string &firstName);
-        void setLastName(const std::string &lastName);
-        void setAvatarPassword(const std::string &avatarPassword);
-        void setVoiceConnector(const std::string &vc)     { mVoiceConnector = vc;    }
+        void setFirstName(const std::string& firstName);
+        void setLastName(const std::string& lastName);
+        void setAvatarPassword(const std::string& avatarPassword);
+        void setVoiceConnector(const std::string& vc)     { mVoiceConnector = vc;    }
 
-        void setCurrencySymbol(const std::string &sym);
-        void setRealCurrencySymbol(const std::string &sym);
+        void setCurrencySymbol(const std::string& sym);
+        void setRealCurrencySymbol(const std::string& sym);
         void setDirectoryFee(int fee);
 
         bool retrieveGridInfo();
 
-        static const char *getPlatformString(Platform platform);
+        static const char* getPlatformString(Platform platform);
         static std::string sanitizeGridNick(std::string &gridnick);
 
         static HippoGridInfo FALLBACK_GRIDINFO;
@@ -116,7 +116,8 @@ private:
         int mDirectoryFee;
 
         // for parsing grid info XML
-        enum XmlState {
+        enum XmlState 
+        {
                 XML_VOID, XML_GRIDNICK, XML_PLATFORM, XML_GRIDNAME,
                 XML_LOGINURI, XML_LOGINPAGE, XML_HELPERURI,
                 XML_WEBSITE, XML_SUPPORT, XML_REGISTER, XML_PASSWORD, XML_SEARCH
@@ -126,9 +127,9 @@ private:
         static std::string sanitizeUri(std::string &uri);
         void formatFee(std::string &fee, int cost, bool showFree) const;
 
-        static void onXmlElementStart(void *userData, const XML_Char *name, const XML_Char **atts);
-        static void onXmlElementEnd(void *userData, const XML_Char *name);
-        static void onXmlCharacterData(void *userData, const XML_Char *s, int len);
+        static void onXmlElementStart(void* userData, const XML_Char* name, const XML_Char** atts);
+        static void onXmlElementEnd(void* userData, const XML_Char* name);
+        static void onXmlCharacterData(void* userData, const XML_Char* s, int len);
 };
 
 
@@ -142,18 +143,18 @@ public:
         void saveFile();
         void discardAndReload();
 
-        HippoGridInfo* getGrid(const std::string &grid) const;
+        HippoGridInfo* getGrid(const std::string& grid) const;
         HippoGridInfo* getConnectedGrid()               const;
         HippoGridInfo* getCurrentGrid()                 const;
         const std::string& getDefaultGridNick()         const;
         const std::string& getCurrentGridNick()         const;
 
-        void setDefaultGrid(const std::string &grid);
-        void setCurrentGrid(const std::string &grid);
+        void setDefaultGrid(const std::string& grid);
+        void setCurrentGrid(const std::string& grid);
         void setCurrentGridAsConnected();
 
-        void addGrid(HippoGridInfo *grid);
-        void deleteGrid(const std::string &grid);
+        void addGrid(HippoGridInfo* grid);
+        void deleteGrid(const std::string& grid);
 
         typedef std::map<std::string, HippoGridInfo*>::iterator GridIterator;
         GridIterator beginGrid() { return mGridInfo.begin(); }
@@ -163,18 +164,18 @@ private:
         std::map<std::string, HippoGridInfo*> mGridInfo;
         std::string mDefaultGrid;
         std::string mCurrentGrid;
-        HippoGridInfo *mConnectedGrid;
+        HippoGridInfo* mConnectedGrid;
         int mDefaultGridsVersion;
 
         void cleanup();
         void loadFromFile();
-        void parseFile(const std::string &fileName, bool mergeIfNewer);
-        void parseUrl(const char *url, bool mergeIfNewer);
+        void parseFile(const std::string& fileName, bool mergeIfNewer);
+        void parseUrl(const char* url, bool mergeIfNewer);
         void parseData(LLSD &gridInfo, bool mergeIfNewer);
 };
 
 
-extern HippoGridManager *gHippoGridManager;
+extern HippoGridManager* gHippoGridManager;
 
 
 #endif