diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
| commit | a3f3ab7e113e44309461b26399d627814f0ce4f9 (patch) | |
| tree | 695b2a41f8d31330634ef59e7d6ece526242fd86 /indra/newview/llpanellogin.cpp | |
| parent | d85247e63e5ff0b488211b62429a4895b48dee27 (diff) | |
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 5fa49e0e8b..b6805f42fa 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -947,6 +947,15 @@ void LLPanelLogin::loadLoginPage() grid = gGridInfo[grid_index].mLabel; } + if(gGridChoice != (EGridInfo)grid_index) + { + LLAppViewer::instance()->resetURIs(); + gGridChoice = (EGridInfo)grid_index; + gViewerWindow->setMenuBackgroundColor(false, + !LLAppViewer::instance()->isInProductionGrid()); + gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor()); + } + char* curl_grid = curl_escape(grid.c_str(), 0); oStr << "&grid=" << curl_grid; curl_free(curl_grid); |