1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 27be9f6..fd7d98e 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -2593,8 +2593,8 @@ void LLCallingCardBridge::performAction(LLFolderView* folder, LLInventoryModel*
                 if (item && (item->getCreatorUUID() != gAgent.getID()) &&
                         (!item->getCreatorUUID().isNull()))
                 {
-                        gIMView->setFloaterOpen(TRUE);
-                        gIMView->addSession(item->getName(), IM_NOTHING_SPECIAL, item->getCreatorUUID());
+                        gIMMgr->setFloaterOpen(TRUE);
+                        gIMMgr->addSession(item->getName(), IM_NOTHING_SPECIAL, item->getCreatorUUID());
                 }
         }
         else if ("lure" == action)
@@ -2671,7 +2671,7 @@ void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 BOOL good_card = (item
                                                   && (LLUUID::null != item->getCreatorUUID())
                                                   && (item->getCreatorUUID() != gAgent.getID()));
-
+                BOOL user_online = (LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID()));
                 items.push_back("Send Instant Message");
                 items.push_back("Offer Teleport...");
                 items.push_back("Conference Chat");
@@ -2679,6 +2679,9 @@ void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 if (!good_card)
                 {
                         disabled_items.push_back("Send Instant Message");
+                }
+                if (!good_card || !user_online)
+                {
                         disabled_items.push_back("Offer Teleport...");
                         disabled_items.push_back("Conference Chat");
                 }