Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Avination-4.0

Browse Source
This commit is contained in:
Melanie
2013-04-20 06:40:51 +02:00
parent 2d717dcf17 1849b5ba1e
commit 37f3695e78
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/hippogridmanager.cpp
View File

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

2
indra/newview/hippogridmanager.h
View File

@@ -40,6 +40,7 @@ public:
bool isOpenSimulator() const; bool isOpenSimulator() const;
bool isAurora() const; bool isAurora() const;
bool isSecondLife() const; bool isSecondLife() const;
bool isAvination() const;
bool isInProductionGrid() const; // Should only be called if isSecondLife() returns true. bool isInProductionGrid() const; // Should only be called if isSecondLife() returns true.
const std::string& getGridName() const; const std::string& getGridName() const;
const std::string& getGridOwner() const; const std::string& getGridOwner() const;
@@ -115,6 +116,7 @@ private:
std::string mSearchUrl; std::string mSearchUrl;
std::string mVoiceConnector; std::string mVoiceConnector;
bool mIsInProductionGrid; bool mIsInProductionGrid;
bool mIsInAvination;
bool mRenderCompat; bool mRenderCompat;
bool mInvLinks; bool mInvLinks;
bool mAutoUpdate; bool mAutoUpdate;