diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
| commit | a7a24dc2f9450e0d51e7110a7eb44e0f27a010db (patch) | |
| tree | 296b5344b33734babfde6aeecb36af2e005ddc32 /indra/newview/llinventorybridge.cpp | |
| parent | 480c3a1acb32e98d0d64aaf7bb70e4d61e6882f6 (diff) | |
| parent | 1a1a0b91c0c4400ec3febac183124314f9226127 (diff) | |
Pull merge from richard/viewer-chui
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); } } } |