diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 18:13:38 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 18:13:38 -0800 |
| commit | 86314438477815eeac17de17799a5e0c0b7d874e (patch) | |
| tree | 139f80ec0c6f12538b115677be890a816b60c98e /indra/newview/llinventorybridge.cpp | |
| parent | 5e85642650d4ffa822b749c5a4a211531545d660 (diff) | |
| parent | 9c55ff93903d19b22dec63a6db26e9ec3436fbf5 (diff) | |
merge changes from product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index dbc12f0617..90e48d22ec 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -97,6 +97,7 @@ #include "llfloateropenobject.h"
#include "lltrans.h"
#include "llappearancemgr.h"
+#include "llimfloater.h"
using namespace LLOldEvents;
@@ -3390,7 +3391,11 @@ void LLCallingCardBridge::performAction(LLFolderView* folder, LLInventoryModel* {
std::string callingcard_name;
gCacheName->getFullName(item->getCreatorUUID(), callingcard_name);
- gIMMgr->addSession(callingcard_name, IM_NOTHING_SPECIAL, item->getCreatorUUID());
+ LLUUID session_id = gIMMgr->addSession(callingcard_name, IM_NOTHING_SPECIAL, item->getCreatorUUID());
+ if (session_id != LLUUID::null)
+ {
+ LLIMFloater::show(session_id);
+ }
}
}
else if ("lure" == action)
|