diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-07 10:51:49 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-07 10:51:49 -0800 |
| commit | fe25f4bfb16c42236fb99a6a1a7bf28da3c2d7c6 (patch) | |
| tree | 73d8f8b550ce9a68882fb656318e983dc968eee0 | |
| parent | d73ca40667527a1fdaf29ac3629ec7ce8a7e0f40 (diff) | |
| parent | 11199f2bef65f67f3ddd798944cb4ad62affa8ed (diff) | |
merge
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 2e64be89fa..6976b06a92 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -202,6 +202,14 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) LLLineEditor::~LLLineEditor() { mCommitOnFocusLost = FALSE; + + // Make sure no context menu linger around once the widget is deleted + LLContextMenu* menu = static_cast<LLContextMenu*>(mContextMenuHandle.get()); + if (menu) + { + menu->hide(); + } + setContextMenu(NULL); // calls onCommit() while LLLineEditor still valid gFocusMgr.releaseFocusIfNeeded( this ); diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 1da3f52bf8..5a37b5b57b 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -114,6 +114,7 @@ void LLFloaterIMContainer::sessionAdded(const LLUUID& session_id, const std::str void LLFloaterIMContainer::sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) { selectConversationPair(session_id, true); + collapseMessagesPane(false); } void LLFloaterIMContainer::sessionVoiceOrIMStarted(const LLUUID& session_id) |