livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad merge of llviewernetwork.*

Armin Weatherwax 2012-08-07 22:36:27 +02:00
parent 3f7d1babde
commit c436d65919
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llviewernetwork.cpp
View File

@ -63,7 +63,7 @@ const std::string DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/";
const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
const std::string MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";
const std::string SYSTEM_GRID_APP_SLURL_BASE = "secondlife:///app";
const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
@ -312,20 +312,6 @@ bool LLGridManager::addGrid(LLSD& grid_data)
{
LL_WARNS("GridManager")<<"duplicate grid id'"<<grid_id<<"' ignored"<<LL_ENDL;
}
else
{
LL_WARNS("GridManager")<<"duplicate grid id'"<<grid_id<<"' ignored"<<LL_ENDL;
}
}
else
{
LL_WARNS("GridManager")<<"duplicate grid name '"<<grid<<"' ignored"<<LL_ENDL;
}
}
else
{
LL_WARNS("GridManager")<<"invalid value passed"<<LL_ENDL;
}
}
else
{

3
indra/newview/llviewernetwork.h
View File

@ -123,9 +123,6 @@ class LLGridManager : public LLSingleton<LLGridManager>
*/
void getLoginURIs(const std::string& grid, std::vector<std::string>& uris);
/// Get the login uris for the selected grid
void getLoginURIs(const std::string& grid, std::vector<std::string>& uris);
/// Get the login uris for the selected grid
void getLoginURIs(std::vector<std::string>& uris);