diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 21:22:46 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 21:22:46 -0700 |
| commit | e44d0254af990b659a281cf0020cd06a3931bd77 (patch) | |
| tree | 6091f92ed222d82be55117a3d968b47482fbb944 /indra/newview/llpanellogin.cpp | |
| parent | 776fea3764bd1a14a712dcfe22f2b254b188f0a6 (diff) | |
| parent | cf05f59dd923d623bc50135214a488a29664ab95 (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 |