diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-05 15:59:14 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-05 15:59:14 -0800 |
| commit | 7ab41a8a815968e274ebbfc459328be40cf5479a (patch) | |
| tree | bb436c37aae93f1925e66802558cf388a74ae7f4 /indra/newview/llpanellogin.cpp | |
| parent | b5f64f9a3f69990d584990b20957e5de9ed2d5b0 (diff) | |
transplant with 2517, also fix single username login issue
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7752750a31..906f091090 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -871,7 +871,7 @@ void LLPanelLogin::loadLoginPage() curl_free(curl_version); // Grid - char* curl_grid = curl_escape(LLGridManager::getInstance()->getGridLabel().c_str(), 0); + char* curl_grid = curl_escape(LLGridManager::getInstance()->getGridID().c_str(), 0); oStr << "&grid=" << curl_grid; curl_free(curl_grid); gViewerWindow->setMenuBackgroundColor(false, !LLGridManager::getInstance()->isInProductionGrid()); |