Merge branch 'master' into Avination-4.0

indra/newview/hippogridmanager.cpp

@@ -52,6 +52,7 @@ HippoGridInfo::HippoGridInfo(const std::string& gridName) :
 	mXmlState(XML_VOID),
 	mVoiceConnector("SLVoice"),
 	mIsInProductionGrid(false),
+	mIsInAvination(false),
 	mRenderCompat(true),
 	mInvLinks(false),
 	mAutoUpdate(false),
@@ -93,6 +94,11 @@ bool HippoGridInfo::isInProductionGrid() const
 	return mIsInProductionGrid;
 }
 
+bool HippoGridInfo::isAvination() const
+{
+	return mIsInAvination;
+}
+
 const std::string& HippoGridInfo::getGridName() const
 {
 	return mGridName;
@@ -241,6 +247,10 @@ void HippoGridInfo::setGridNick(std::string gridNick)
 	{
 		mIsInProductionGrid = true;
 	}
+	if(gridNick == "avination")
+	{
+		mIsInAvination = true;
+	}
 }
 
 void HippoGridInfo::setLoginUri(const std::string& loginUri)
@@ -251,6 +261,11 @@ void HippoGridInfo::setLoginUri(const std::string& loginUri)
 	{
 		mIsInProductionGrid = true;
 	}
+	if (utf8str_tolower(LLURI(uri).hostName()) == "login.avination.com" ||
+		utf8str_tolower(LLURI(uri).hostName()) == "login.avination.net")
+	{
+		mIsInAvination = true;
+	}
 }
 
 void HippoGridInfo::setLoginPage(const std::string& loginPage)

indra/newview/hippogridmanager.h

@@ -40,6 +40,7 @@ public:
 	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;
 	const std::string& getGridOwner()       const;	
@@ -115,6 +116,7 @@ private:
 	std::string mSearchUrl;
 	std::string mVoiceConnector;
 	bool mIsInProductionGrid;
+	bool mIsInAvination;
 	bool mRenderCompat;
 	bool mInvLinks;
 	bool mAutoUpdate;