diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
| commit | b0af6b8acb33c86e5ac8d693131b5c9e7d9407b5 (patch) | |
| tree | dbe58da2c0ff07a8950548a513db31806f0308d4 /indra/newview/llfloatermediasettings.cpp | |
| parent | d3bde04a8c3a2cd142bb75dbcad577d083aad0d1 (diff) | |
| parent | abae31cb4a26500012663cdc2a06a290ac4e46c9 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatermediasettings.cpp')
| -rw-r--r-- | indra/newview/llfloatermediasettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp index 7388f7ea3f..62ec17f89a 100644 --- a/indra/newview/llfloatermediasettings.cpp +++ b/indra/newview/llfloatermediasettings.cpp @@ -207,7 +207,7 @@ void LLFloaterMediaSettings::commitFields() if (hasFocus()) { LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); - if (cur_focus->acceptsTextInput()) + if (cur_focus && cur_focus->acceptsTextInput()) { cur_focus->onCommit(); }; |