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

FIRE-11586: More hammering on SLURLs; Restore grid manager workaround (the actual start SLURL is set in LLStartup in idle_startup() with state = STATE_AUDIO_INIT)

meow-7.2.2
Ansariel 2014-02-12 16:55:48 +01:00
parent b067cf3422
commit 0741b35938
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/fsslurl.cpp
View File

@ -144,6 +144,7 @@ LLSLURL::LLSLURL(const std::string& slurl)
// default to current
std::string default_grid = LLGridManager::getInstance()->getGrid();
mGrid = default_grid;
LL_DEBUGS("SLURL") << "default grid: " << default_grid << LL_ENDL;
if(slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
{

13
indra/newview/llappviewer.cpp
View File

@ -3125,11 +3125,14 @@ bool LLAppViewer::initConfiguration()
if(! CmdLineLoginLocation.empty())
{
start_slurl = CmdLineLoginLocation;
LLStartUp::setStartSLURL(start_slurl);
if(start_slurl.getType() == LLSLURL::LOCATION)
{
LLGridManager::getInstance()->setGridChoice(start_slurl.getGrid());
}
// <FS:Ansariel> FIRE-11586: Restore grid manager workaround (grid is still empty here!)
//LLStartUp::setStartSLURL(start_slurl);
//if(start_slurl.getType() == LLSLURL::LOCATION)
//{
// LLGridManager::getInstance()->setGridChoice(start_slurl.getGrid());
// }
LLStartUp::setStartSLURLString(CmdLineLoginLocation);
// </FS:Ansariel>
}
// <FS:TT> Hacking to save the skin and theme for future use.