diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-23 09:52:00 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-23 09:52:00 -0800 |
| commit | 5733f7090460ea2591bf1af961409c1a77cc916e (patch) | |
| tree | fccda7ae74da59d4541f2825178ea35c71bd3e9b /indra/newview/llfloaterimcontainer.cpp | |
| parent | d0204ab367f5ceb5eab89e2273b897975acbfe5a (diff) | |
| parent | e6000d5930dd646bb15951336670bab4950515d8 (diff) | |
merging
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 6e9f7a380f..7e80237430 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -431,7 +431,9 @@ bool LLFloaterIMContainer::onConversationModelEvent(const LLSD& event) return false; } LLConversationViewParticipant* participant_view = session_view->findParticipant(participant_id); - LLFloaterIMSessionTab *conversation_floater = (session_id.isNull() ? (LLFloaterIMSessionTab*)(LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")) : (LLFloaterIMSessionTab*)(LLFloaterIMSession::findInstance(session_id))); + LLFloaterIMSessionTab *conversation_floater = (session_id.isNull() ? + (LLFloaterIMSessionTab*)(LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")) + : (LLFloaterIMSessionTab*)(LLFloaterIMSession::findInstance(session_id))); if (type == "remove_participant") { |