diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-22 10:14:33 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-22 10:14:33 +0300 |
| commit | f25da4a2c7ad7fc41d15c51524a110e5386d1e5b (patch) | |
| tree | fa874cb1966cefda551fd653180c29f5c3bb974d /indra/newview/llpanellogin.cpp | |
| parent | 525a56872f1e66651b578e59a776643352a3d523 (diff) | |
| parent | 5e5ad8582cbbe3dd656d9b3824d96a37e312a31a (diff) | |
Merge with default branch
--HG--
branch : product-engine
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) |