diff --git a/indra/newview/hippogridmanager.cpp b/indra/newview/hippogridmanager.cpp
index 9447a557c..446d28282 100644
--- a/indra/newview/hippogridmanager.cpp
+++ b/indra/newview/hippogridmanager.cpp
@@ -68,42 +68,6 @@ HippoGridInfo::HippoGridInfo(const std::string& gridName) :
 // ********************************************************************
 // Getters
 
-HippoGridInfo::Platform HippoGridInfo::getPlatform()
-{
-	return mPlatform;
-}
-
-bool HippoGridInfo::isOpenSimulator() const
-{
-	return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM || mPlatform == HippoGridInfo::PLATFORM_AURORA);
-}
-
-bool HippoGridInfo::isAurora() const
-{
-	return (mPlatform == HippoGridInfo::PLATFORM_AURORA);
-}
-
-bool HippoGridInfo::isSecondLife() const
-{
-	return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
-}
-
-bool HippoGridInfo::isInProductionGrid() const
-{
-	llassert(mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
-	return mIsInProductionGrid;
-}
-
-bool HippoGridInfo::isAvination() const
-{
-	return mIsInAvination;
-}
-
-const std::string& HippoGridInfo::getGridName() const
-{
-	return mGridName;
-}
-
 const std::string& HippoGridInfo::getGridOwner() const
 {
 	if(isSecondLife())
@@ -117,68 +81,6 @@ const std::string& HippoGridInfo::getGridOwner() const
 	}	
 }
 
-const std::string& HippoGridInfo::getLoginUri() const
-{
-	return mLoginUri;
-}
-
-const std::string& HippoGridInfo::getLoginPage() const
-{
-	return mLoginPage;
-}
-
-const std::string& HippoGridInfo::getHelperUri() const
-{
-	return mHelperUri;
-}
-
-const std::string& HippoGridInfo::getWebSite() const
-{
-	return mWebSite;
-}
-
-const std::string& HippoGridInfo::getSupportUrl() const
-{
-	return mSupportUrl;
-}
-
-const std::string& HippoGridInfo::getRegisterUrl() const
-{
-	return mRegisterUrl;
-}
-
-const std::string& HippoGridInfo::getPasswordUrl() const
-{
-	return mPasswordUrl;
-}
-
-const std::string& HippoGridInfo::getSearchUrl() const
-{
-	return mSearchUrl;
-}
-
-const std::string& HippoGridInfo::getGridMessage() const
-{
-	return mGridMessage;
-}
-
-bool HippoGridInfo::isRenderCompat() const
-{
-	return mRenderCompat;
-}
-
-const std::string& HippoGridInfo::getCurrencySymbol() const
-{
-	return mCurrencySymbol;
-}
-
-const std::string& HippoGridInfo::getRealCurrencySymbol() const
-{
-	return mRealCurrencySymbol;
-}
-
-
-
 // ********************************************************************
 // Setters
 
diff --git a/indra/newview/hippogridmanager.h b/indra/newview/hippogridmanager.h
index 147ab0816..8d84ba816 100644
--- a/indra/newview/hippogridmanager.h
+++ b/indra/newview/hippogridmanager.h
@@ -36,32 +36,32 @@ public:
 
 	explicit HippoGridInfo(const std::string& gridName);
 
-	Platform           getPlatform();
-	bool isOpenSimulator() const;
-	bool isAurora() const;
-	bool isSecondLife() const;
-	bool isAvination() const;
-	bool isInProductionGrid() const;		// Should only be called if isSecondLife() returns true.
-	const std::string& getGridName()        const;
+	Platform getPlatform() { return mPlatform; }
+	bool isOpenSimulator() const { return (mPlatform == PLATFORM_OPENSIM || mPlatform == PLATFORM_AURORA); }
+	bool isAurora() const { return (mPlatform == PLATFORM_AURORA); }
+	bool isSecondLife() const { return (mPlatform == PLATFORM_SECONDLIFE); }
+	bool isAvination() const { return mIsInAvination; }
+	bool isInProductionGrid() const { llassert(mPlatform == PLATFORM_SECONDLIFE); return mIsInProductionGrid; } // Should only be called if isSecondLife() returns true.
+	const std::string& getGridName()        const { return mGridName; }
 	const std::string& getGridOwner()       const;	
-	const std::string& getLoginUri()        const;
-	const std::string& getLoginPage()       const;
-	const std::string& getHelperUri()       const;
-	const std::string& getWebSite()         const;
-	const std::string& getSupportUrl()      const;
-	const std::string& getRegisterUrl()     const;
-	const std::string& getPasswordUrl()     const;
+	const std::string& getLoginUri()        const { return mLoginUri; }
+	const std::string& getLoginPage()       const { return mLoginPage; }
+	const std::string& getHelperUri()       const { return mHelperUri; }
+	const std::string& getWebSite()         const { return mWebSite; }
+	const std::string& getSupportUrl()      const { return mSupportUrl; }
+	const std::string& getRegisterUrl()     const { return mRegisterUrl; }
+	const std::string& getPasswordUrl()     const { return mPasswordUrl; }
 	// Returns the url base used for the Web Search tab
-	const std::string& getSearchUrl()       const;
-	const std::string& getGridMessage()     const;
+	const std::string& getSearchUrl()       const { return mSearchUrl; }
+	const std::string& getGridMessage()     const { return mGridMessage; }
 	const std::string& getVoiceConnector()  const { return mVoiceConnector; }
 	std::string getSearchUrl(SearchType ty, bool is_web) const;
-	bool isRenderCompat()                   const;
-	std::string getGridNick();	
+	bool isRenderCompat()                   const { return mRenderCompat; }
+	std::string getGridNick();
 	int getMaxAgentGroups() const { return mMaxAgentGroups; }
 
-	const std::string& getCurrencySymbol()     const;
-	const std::string& getRealCurrencySymbol() const;
+	const std::string& getCurrencySymbol()     const { return mCurrencySymbol; }
+	const std::string& getRealCurrencySymbol() const { return mRealCurrencySymbol; }
 	std::string getUploadFee()                 const;
 	std::string getGroupCreationFee()          const;
 	std::string getDirectoryFee()              const;