From efb512dc65c43ea73e7b4da3e2c45d276043842e Mon Sep 17 00:00:00 2001 From: Steve Bennetts Date: Wed, 18 Nov 2009 14:07:35 -0800 Subject: EXT-2644 - Add "Close Session" option to chicklet context menus --- indra/newview/llavataractions.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index ee4a9df15f..0844cca766 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -189,6 +189,19 @@ void LLAvatarActions::startIM(const LLUUID& id) make_ui_sound("UISndStartIM"); } +// static +void LLAvatarActions::endIM(const LLUUID& id) +{ + if (id.isNull()) + return; + + LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL, id); + if (session_id != LLUUID::null) + { + gIMMgr->leaveSession(session_id); + } +} + // static void LLAvatarActions::startCall(const LLUUID& id) { -- cgit v1.2.3 From 70a0dbe8f8466438e12a45e70d0f901b9324f228 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Fri, 20 Nov 2009 22:57:59 +0200 Subject: Renamed classes and files for "Me" task panel for better readability. Renamed files: - indra/newview/llpanelmeprofile.{cpp,h} to llpanelme.{cpp,h} - panel_me_profile.xml to panel_me.xml - panel_profile_user.xml to panel_my_profile.xml Renamed classes: - LLPanelAvatarMeProfile to LLPanelMyProfile - LLPanelMeProfile to LLPanelMe - LLPanelMeProfileEdit to LLPanelMyProfileEdit --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 0844cca766..130f729df0 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -297,7 +297,7 @@ void LLAvatarActions::showProfile(const LLUUID& id) //Show own profile if(gAgent.getID() == id) { - LLSideTray::getInstance()->showPanel("panel_me_profile", params); + LLSideTray::getInstance()->showPanel("panel_me", params); } //Show other user profile else -- cgit v1.2.3 From 52c27b99b839cccab09b61c5b02ced2e9df0a04b Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 20 Nov 2009 17:52:17 -0500 Subject: EXT-829 share button in people panel is inactive First pass at getting share buttons in the three places we need them: person's profile IM window people panel Only UI changes so far, functionality in a future checkin. Will be reviewed before pushing. --HG-- branch : avatar-pipeline --- indra/newview/llavataractions.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 0844cca766..a2beb6af93 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -324,6 +324,12 @@ void LLAvatarActions::pay(const LLUUID& id) } } +//static +void LLAvatarActions::share(const LLUUID& id) +{ + // TODO: share items with selected avatar +} + // static void LLAvatarActions::toggleBlock(const LLUUID& id) { -- cgit v1.2.3 From 35ebf50ec7a0f11aade28130b5ed6c3263c92359 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 23 Nov 2009 19:08:52 +0200 Subject: Fixed normal bug EXT-2668 (NONE group is present in the Group Chooser for which to send invitation). --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 0844cca766..a133bd6fe6 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -347,9 +347,9 @@ void LLAvatarActions::inviteToGroup(const LLUUID& id) LLFloaterGroupPicker* widget = LLFloaterReg::showTypedInstance("group_picker", LLSD(id)); if (widget) { - widget->removeNoneOption(); widget->center(); widget->setPowersMask(GP_MEMBER_INVITE); + widget->removeNoneOption(); widget->setSelectGroupCallback(boost::bind(callback_invite_to_group, _1, id)); } } -- cgit v1.2.3 From 24dbd81763254178bfcdb15d1ee3e4be48032b4b Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 23 Nov 2009 13:23:54 -0500 Subject: EXT-829 share button in profile inactive refactored share code to all call LLAvatarActions::share. Function opens an IM window if one doesn't already exist and prints an appropriate message, as well as opening the inventory sidepanel. Verified working in IM window, people tab, and individual's profile. Will be post-reviewed before push. --HG-- branch : avatar-pipeline --- indra/newview/llavataractions.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index a2beb6af93..89a774fd2b 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -327,7 +327,22 @@ void LLAvatarActions::pay(const LLUUID& id) //static void LLAvatarActions::share(const LLUUID& id) { - // TODO: share items with selected avatar + LLSD key; + LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); + + + LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,id); + + if (!gIMMgr->hasSession(session_id)) + { + startIM(id); + } + + if (gIMMgr->hasSession(session_id)) + { + // we should always get here, but check to verify anyways + LLIMModel::getInstance()->addMessage(session_id, SYSTEM_FROM, LLUUID::null, LLTrans::getString("share_alert"), false); + } } // static -- cgit v1.2.3