From 6f66cdf7a1307ab37d7f07928fabbe7aa4ac2673 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 8 Oct 2009 00:31:01 +0000 Subject: EXT-1325 Texture Picker does not open EXT-1264 'Zoom in' world context menu opens IM session reviewed by Richard --- indra/newview/llinspectavatar.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'indra/newview/llinspectavatar.cpp') diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 4046c893c1..947e5d80da 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -109,10 +109,11 @@ private: void onClickPay(); void onClickBlock(); void onClickReport(); + void onClickZoomIn(); + void onClickFindOnMap(); bool onVisibleFindOnMap(); bool onVisibleGodMode(); void onClickMuteVolume(); - void onFindOnMap(); void onVolumeChange(const LLSD& data); // Callback for gCacheName to look up avatar name @@ -196,7 +197,8 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd) mCommitCallbackRegistrar.add("InspectAvatar.Pay", boost::bind(&LLInspectAvatar::onClickPay, this)); mCommitCallbackRegistrar.add("InspectAvatar.Block", boost::bind(&LLInspectAvatar::onClickBlock, this)); mCommitCallbackRegistrar.add("InspectAvatar.Report", boost::bind(&LLInspectAvatar::onClickReport, this)); - mCommitCallbackRegistrar.add("InspectAvatar.FindOnMap", boost::bind(&LLInspectAvatar::onFindOnMap, this)); + mCommitCallbackRegistrar.add("InspectAvatar.FindOnMap", boost::bind(&LLInspectAvatar::onClickFindOnMap, this)); + mCommitCallbackRegistrar.add("InspectAvatar.ZoomIn", boost::bind(&LLInspectAvatar::onClickZoomIn, this)); mVisibleCallbackRegistrar.add("InspectAvatar.VisibleFindOnMap", boost::bind(&LLInspectAvatar::onVisibleFindOnMap, this)); mVisibleCallbackRegistrar.add("InspectAvatar.VisibleGodMode", boost::bind(&LLInspectAvatar::onVisibleGodMode, this)); @@ -476,7 +478,6 @@ void LLInspectAvatar::onClickViewProfile() // hide inspector when showing profile setFocus(FALSE); LLAvatarActions::showProfile(mAvatarID); - } bool LLInspectAvatar::onVisibleFindOnMap() @@ -521,8 +522,13 @@ void LLInspectAvatar::onClickReport() LLFloaterReporter::showFromObject(mAvatarID); } +void LLInspectAvatar::onClickZoomIn() +{ + handle_zoom_to_object(mAvatarID); + closeFloater(); +} -void LLInspectAvatar::onFindOnMap() +void LLInspectAvatar::onClickFindOnMap() { gFloaterWorldMap->trackAvatar(mAvatarID, mAvatarName); LLFloaterReg::showInstance("world_map"); -- cgit v1.2.3 From 18f1895bf2abceadba292672eb80a384f0142c73 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Sat, 10 Oct 2009 00:43:39 +0000 Subject: EXT-1400 New 'name popup' lets you do things (IM, TP etc) to your own avatar EXT-1021 Update code to use new Inventory Icon art files in floater_invetory.xml EXT-176 Open and closed state for art for folders in list view in side panel --- indra/newview/llinspectavatar.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llinspectavatar.cpp') diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 947e5d80da..261d0836a0 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -276,6 +276,11 @@ void LLInspectAvatar::onOpen(const LLSD& data) mAvatarID = data["avatar_id"]; mPartnerID = LLUUID::null; + BOOL self = mAvatarID == gAgent.getID(); + + getChild("gear_self_btn")->setVisible(self); + getChild("gear_btn")->setVisible(!self); + // Position the inspector relative to the mouse cursor // Similar to how tooltips are positioned // See LLToolTipMgr::createToolTip -- cgit v1.2.3 From b5ffeaff1ab53008a8f1ee72cd1f398bd1ff21c2 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 14 Oct 2009 20:37:03 +0000 Subject: merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3 * Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030 * New Dev: EXT-1293 EXT-1416 --- indra/newview/llinspectavatar.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llinspectavatar.cpp') diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 261d0836a0..44dd11dd86 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -39,7 +39,6 @@ #include "llavataractions.h" #include "llavatarpropertiesprocessor.h" #include "llcallingcard.h" -#include "lldateutil.h" // ageFromDate() #include "llfloaterreporter.h" #include "llfloaterworldmap.h" #include "llmutelist.h" @@ -359,7 +358,7 @@ void LLInspectAvatar::processAvatarData(LLAvatarData* data) { LLStringUtil::format_map_t args; args["[BORN_ON]"] = data->born_on; - args["[AGE]"] = LLDateUtil::ageFromDate(data->born_on); + args["[AGE]"] = data->born_on; args["[SL_PROFILE]"] = data->about_text; args["[RW_PROFILE"] = data->fl_about_text; args["[ACCTTYPE]"] = LLAvatarPropertiesProcessor::accountType(data); -- cgit v1.2.3