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

Fix detection of mIsInProductionGrid and fix getMarketplaceDomain()

Browse Source 
getMarketplaceDomain() should return aditi.lindenlab.com for aditi,
not secondlife.aditi.lindenlab.com.
mIsInProductionGrid wasn't set correctly.
This commit is contained in:
Aleric Inglewood
2012-11-17 21:38:55 +01:00
parent fce64f8f12
commit 746f419e80
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/hippogridmanager.cpp
View File

@@ -218,7 +218,6 @@ void HippoGridInfo::setGridName(const std::string& gridName)
{ {
setGridNick(gridName); setGridNick(gridName);
}*/ }*/
mIsInProductionGrid = gridName == "secondlife";
} }
void HippoGridInfo::setGridNick(std::string gridNick) void HippoGridInfo::setGridNick(std::string gridNick)
@@ -228,12 +227,20 @@ void HippoGridInfo::setGridNick(std::string gridNick)
{ {
setGridName(gridNick); setGridName(gridNick);
} }
if(gridNick == "secondlife")
{
mIsInProductionGrid = true;
}
} }
void HippoGridInfo::setLoginUri(const std::string& loginUri) void HippoGridInfo::setLoginUri(const std::string& loginUri)
{ {
std::string uri = loginUri; std::string uri = loginUri;
mLoginUri = sanitizeUri(uri); mLoginUri = sanitizeUri(uri);
if (utf8str_tolower(LLURI(uri).hostName()) == "login.agni.lindenlab.com")
{
mIsInProductionGrid = true;
}
} }
void HippoGridInfo::setLoginPage(const std::string& loginPage) void HippoGridInfo::setLoginPage(const std::string& loginPage)

42
indra/newview/llmarketplacefunctions.cpp
View File

@@ -41,24 +41,54 @@
// Helpers // Helpers
// //
static std::string getLoginUriDomain()
{
LLURI uri(gHippoGridManager->getConnectedGrid()->getLoginUri());
std::string hostname = uri.hostName(); // Ie, "login.<gridid>.lindenlab.com"
if (hostname.substr(0, 6) == "login.")
{
hostname = hostname.substr(6); // "<gridid>.lindenlab.com"
}
return hostname;
}
// Apart from well-known cases, in general this function returns the domain of the loginUri (with the "login." stripped off).
// This should be correct for all SL BETA grids, assuming they have the form of "login.<gridId>.lindenlab.com", in which
// case it returns "<gridId>.lindenlab.com".
//
// Well-known cases that deviate from this:
// agni --> "secondlife.com"
// damballah --> "secondlife-staging.com"
//
static std::string getMarketplaceDomain() static std::string getMarketplaceDomain()
{ {
std::string domain = "secondlife.com"; std::string domain;
if (gHippoGridManager->getCurrentGrid()->isSecondLife()) if (gHippoGridManager->getCurrentGrid()->isSecondLife())
{ {
if (!gHippoGridManager->getConnectedGrid()->isInProductionGrid()) if (gHippoGridManager->getConnectedGrid()->isInProductionGrid())
{ {
domain = "secondlife.aditi.lindenlab.com"; domain = "secondlife.com"; // agni
}
else
{
// SecondLife(tm) BETA grid.
// Using the login URI is a bit of a kludge, but it's the best we've got at the moment.
domain = utf8str_tolower(getLoginUriDomain()); // <gridid>.lindenlab.com; ie, "aditi.lindenlab.com".
std::string::size_type len = domain.length();
llassert(len > 14 && domain.substr(len - 14) == ".lindenlab.com");
if (domain == "damballah.lindenlab.com")
{
domain = "secondlife-staging.com";
}
} }
} }
else else
{ {
// TODO: Find out if OpenSim, and Avination adopted any outbox stuffs, if so code HippoGridManager for this // TODO: Find out if OpenSim, and Avination adopted any outbox stuffs, if so code HippoGridManager for this
// Aurora grid has not. // Aurora grid has not.
// For now, reset domain on other grids, so we don't harass LL web services. // For now, set domain on other grids to the loginUri domain, so we don't harass LL web services.
domain = ""; //gHippoGridManager->getCurrentGrid()->getMarketPlaceDomain(); domain = getLoginUriDomain(); //gHippoGridManager->getCurrentGrid()->getMarketPlaceDomain();
} }
return domain; return domain;
} }