diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-01 20:22:55 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-01 20:22:55 +0200 |
| commit | b9116764a97dfdccf803315c8c3b0d29fa3ce654 (patch) | |
| tree | edeeb2af6d1a2bec9ed562edc224f448c0645940 /indra/newview/llchicletbar.cpp | |
| parent | 51cabb2089244f170b307b436e0014a872a145ed (diff) | |
| parent | 424a80155ac755bc0191ddd44ef125bdbda39fa5 (diff) | |
merging into latest changes
Diffstat (limited to 'indra/newview/llchicletbar.cpp')
| -rw-r--r-- | indra/newview/llchicletbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 39f5d0b8f6..3ebb83b336 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -97,7 +97,7 @@ void LLChicletBar::sessionAdded(const LLUUID& session_id, const std::string& nam // Do not spawn chiclet when using the new multitab conversation UI if (LLIMConversation::isChatMultiTab()) { - LLIMFloater::addToHost(session_id); + LLIMConversation::addToHost(session_id); return; } |