diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:20:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:20:24 -0400 |
| commit | f17623d8c67a10c2d7547e40ac8442c703d107ed (patch) | |
| tree | 2ae37385da280a758a66e920f9bdb317dcde59ee /indra/newview/llpanellogin.cpp | |
| parent | 4e538adca41d486125c3b887ce694c457bcab157 (diff) | |
| parent | bef22c0325cbfeb3d290753a66ecf862bf4593d3 (diff) | |
Automated merge with ssh://192.168.2.107/c:/linden/viewer-release/
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 1cb0f4601b..144839b554 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1153,7 +1153,10 @@ void LLPanelLogin::onSelectServer(LLUICtrl*, void*) void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe) { - if (!sInstance) return; + if (!sInstance) + { + return; + } LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo"); if(fe == combo) |