diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-30 18:50:37 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-30 18:50:37 +0200 |
| commit | 1160d82fb8566d7c76f0c39785c97fcf31768f0c (patch) | |
| tree | 5f3b9c28b1e277ee7d339bf54ee11d27250e655b /indra/newview/llinventorybridge.cpp | |
| parent | d2087bdd8a6591cafc6c8d8de7582a9dda6ea352 (diff) | |
| parent | 5215bf6edef283cb6c570d3e7aea11f0ecf8313f (diff) | |
merging into latest changes
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 28c2edbe84..5d8d82b226 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -46,7 +46,7 @@ #include "llfriendcard.h" #include "llgesturemgr.h" #include "llgiveinventory.h" -#include "llimfloater.h" +#include "llimfloatercontainer.h" #include "llimview.h" #include "llclipboard.h" #include "llinventorydefines.h" @@ -4704,7 +4704,7 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act LLUUID session_id = gIMMgr->addSession(callingcard_name, IM_NOTHING_SPECIAL, item->getCreatorUUID()); if (session_id != LLUUID::null) { - LLIMFloater::show(session_id); + LLIMFloaterContainer::getInstance()->showConversation(session_id); } } } |