diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-05 09:00:06 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-05 09:00:06 -0800 |
| commit | fe09598fbecdf8620eba8ac1a46b3062bcb6191a (patch) | |
| tree | 81b461115315ddd0a84171ed86dc315713dd79c3 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | e1b7153b4782ec4d1f8b028b435e7e4f0cf98dc2 (diff) | |
| parent | 7b47f8e3ddc0547b667ad3e9e97dc924312f55e7 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index d04fa2674d..da25f95ffe 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -60,6 +60,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id) , mRefreshTimer(new LLTimer()) , mIsHostAttached(false) { + setAutoFocus(FALSE); mSession = LLIMModel::getInstance()->findIMSession(mSessionID); mCommitCallbackRegistrar.add("IMSession.Menu.Action", @@ -124,7 +125,6 @@ void LLFloaterIMSessionTab::setVisible(BOOL visible) { LLFloaterIMSessionTab::addToHost(mSessionID); } - setFocus(visible); } /*virtual*/ |