diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-28 17:01:46 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-28 17:01:46 -0400 |
| commit | ea7047579da5d252aac34e69dabe9e9e9002a2fb (patch) | |
| tree | fcb26ecad7417083d6b2f0fcee651f95364d2ec8 /indra/newview/llpanellogin.cpp | |
| parent | 7efaa216a1c42ed85663bcf2c7d0ef6df718c780 (diff) | |
| parent | bb973c38e30bc0711265ba04630a8475a3f98c59 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 0009f7203a..c8dae024cf 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1164,7 +1164,8 @@ void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe) void LLPanelLogin::updateLoginPanelLinks() { - LLSD grid_data = LLGridManager::getInstance()->getGridInfo(); + LLSD grid_data; + LLGridManager::getInstance()->getGridInfo(grid_data); bool system_grid = grid_data.has(GRID_IS_SYSTEM_GRID_VALUE); // need to call through sInstance, as it's called from onSelectServer, which |