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

FIRE-11586: Temporary fix for SLURLs until grid manager has been reworked

Ansariel 2013-11-08 19:28:00 +01:00
parent 0cdc7aa02a
commit b054b96d6a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llappviewer.cpp
View File

@ -3209,7 +3209,10 @@ bool LLAppViewer::initConfiguration()
if (start_slurl.isValid() &&
(gSavedSettings.getBOOL("SLURLPassToOtherInstance")))
{
if (sendURLToOtherInstance(start_slurl.getSLURLString()))
// <FS:Ansariel> FIRE-11586: Temporary fix until grid manager has been reworked
//if (sendURLToOtherInstance(start_slurl.getSLURLString()))
if (sendURLToOtherInstance(CmdLineLoginLocation))
// </FS:Ansariel>
{
// successfully handed off URL to existing instance, exit
return false;