From 76beebae685d859d4afbff6db3ae6d7785b204da Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 9 May 2022 20:53:21 +0300 Subject: SL-15312 Fixed picks tabs being too thin --- indra/newview/llpanelprofile.cpp | 15 +++++++++++++-- indra/newview/llpanelprofile.h | 6 ++++++ indra/newview/llpanelprofileclassifieds.cpp | 6 +++--- indra/newview/llpanelprofilepicks.cpp | 4 ++-- .../skins/default/xui/en/panel_profile_pick.xml | 20 ++++++++++---------- .../skins/default/xui/en/panel_profile_picks.xml | 1 + .../default/xui/en/panel_profile_secondlife.xml | 2 +- 7 files changed, 36 insertions(+), 18 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index bb6fdc1757..031c1db7e2 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -258,6 +258,10 @@ void request_avatar_properties_coro(std::string cap_url, LLUUID agent_id) { panel_notes->processProperties(&avatar_notes); } + if (panel_sl) + { + panel_sl->processNotesProperties(&avatar_notes); + } } //TODO: changes take two minutes to propagate! @@ -818,6 +822,7 @@ BOOL LLPanelProfileSecondLife::postBuild() mSecondLifePic = getChild("2nd_life_pic"); mSecondLifePicLayout = getChild("image_stack"); mDescriptionEdit = getChild("sl_description_edit"); + mNotesSnippet = getChild("notes_snippet"); mAgentActionMenuButton = getChild("agent_actions_menu"); mSaveDescriptionChanges = getChild("save_description_changes"); mDiscardDescriptionChanges = getChild("discard_description_changes"); @@ -965,6 +970,11 @@ void LLPanelProfileSecondLife::processGroupProperties(const LLAvatarGroups* avat mGroupList->setGroups(mGroups); } +void LLPanelProfileSecondLife::processNotesProperties(LLAvatarNotes* avatar_notes) +{ + mNotesSnippet->setValue(avatar_notes->notes); +} + void LLPanelProfileSecondLife::openGroupProfile() { LLUUID group_id = mGroupList->getSelectedUUID(); @@ -1532,14 +1542,15 @@ void LLPanelProfileSecondLife::onSetDescriptionDirty() void LLPanelProfileSecondLife::onShowInSearchCallback() { - if (mAllowPublish == mShowInSearchCombo->getValue().asBoolean()) + S32 value = mShowInSearchCombo->getValue().asInteger(); + if (mAllowPublish == (bool)value) { return; } std::string cap_url = gAgent.getRegionCapability(PROFILE_PROPERTIES_CAP); if (!cap_url.empty()) { - mAllowPublish = mShowInSearchCombo->getValue().asBoolean(); + mAllowPublish = value; LLSD data; data["allow_publish"] = mAllowPublish; LLCoros::instance().launch("putAgentUserInfoCoro", diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h index c4b48979ea..fa98e6fd1b 100644 --- a/indra/newview/llpanelprofile.h +++ b/indra/newview/llpanelprofile.h @@ -115,6 +115,11 @@ protected: */ void processGroupProperties(const LLAvatarGroups* avatar_groups); + /** + * Processes notes related data received from server. + */ + void processNotesProperties(LLAvatarNotes* avatar_notes); + /** * Fills common for Avatar profile and My Profile fields. */ @@ -182,6 +187,7 @@ private: LLIconCtrl* mSecondLifePic; LLPanel* mSecondLifePicLayout; LLTextEditor* mDescriptionEdit; + LLTextEditor* mNotesSnippet; LLMenuButton* mAgentActionMenuButton; LLButton* mSaveDescriptionChanges; LLButton* mDiscardDescriptionChanges; diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp index 9cd7ca8160..56f9a387a1 100644 --- a/indra/newview/llpanelprofileclassifieds.cpp +++ b/indra/newview/llpanelprofileclassifieds.cpp @@ -203,7 +203,7 @@ LLPanelProfileClassifieds::~LLPanelProfileClassifieds() void LLPanelProfileClassifieds::onOpen(const LLSD& key) { - LLPanelProfileTab::onOpen(key); + LLPanelProfilePropertiesProcessorTab::onOpen(key); resetData(); @@ -592,7 +592,7 @@ void LLPanelProfileClassified::onOpen(const LLSD& key) if(is_new) { - LLPanelProfileTab::setAvatarId(gAgent.getID()); + LLPanelProfilePropertiesProcessorTab::setAvatarId(gAgent.getID()); setPosGlobal(gAgent.getPositionGlobal()); @@ -634,7 +634,7 @@ void LLPanelProfileClassified::onOpen(const LLSD& key) { return; } - LLPanelProfileTab::setAvatarId(avatar_id); + LLPanelProfilePropertiesProcessorTab::setAvatarId(avatar_id); setClassifiedId(key["classified_id"]); setClassifiedName(key["classified_name"]); diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp index b3109e7da2..c452fb5abd 100644 --- a/indra/newview/llpanelprofilepicks.cpp +++ b/indra/newview/llpanelprofilepicks.cpp @@ -131,7 +131,7 @@ LLPanelProfilePicks::~LLPanelProfilePicks() void LLPanelProfilePicks::onOpen(const LLSD& key) { - LLPanelProfileTab::onOpen(key); + LLPanelProfilePropertiesProcessorTab::onOpen(key); resetData(); @@ -405,7 +405,7 @@ void LLPanelProfilePick::setAvatarId(const LLUUID& avatar_id) { return; } - LLPanelProfileTab::setAvatarId(avatar_id); + LLPanelProfilePropertiesProcessorTab::setAvatarId(avatar_id); // creating new Pick if (getPickId().isNull() && getSelfProfile()) diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml index 0417df43c9..b5e5f593a7 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml @@ -18,8 +18,8 @@ name="pick_snapshot" top="10" left="10" - height="180" - width="290" + height="161" + width="260" follows="left|top" layout="topleft" fallback_image="default_land_picture.j2c" @@ -41,7 +41,7 @@ enabled="false" top_pad="8" left="10" - height="70" + height="102" width="290" follows="all" layout="topleft" @@ -68,10 +68,10 @@