summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplacestab.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-04-25 15:48:20 -0400
committerNat Goodspeed <nat@lindenlab.com>2019-04-25 15:48:20 -0400
commit70aa89f708254c47766f4629e9131ea492829129 (patch)
tree084f9f1cfa32c11a519799616b70d4602a246cd1 /indra/newview/llpanelplacestab.cpp
parenta2d4122de41ff161b7397ca663a41595cb9dbf2a (diff)
SL-11049: Notice explicit --grid command-line switch and honor it.
LLPanelLogin's constructor checks both LLGridManager::getGrid() and LLStartUp::getStartSLURL(). But by the time we get there, we've blurred the distinction between explicit command-line arguments and defaults left over from a previous run. Of course, if the grid implied by getStartSLURL() is the same as the getGrid(), the distinction is irrelevant. But if they differ, up until now, getStartSLURL() has always "won" -- even when getGrid() was set by an explicit --grid switch whereas getStartSLURL() was only left over from a previous run. Notice that case and try to avoid overriding the explicitly-specified grid with the grid from the default SLURL.
Diffstat (limited to 'indra/newview/llpanelplacestab.cpp')
0 files changed, 0 insertions, 0 deletions