livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-15312 Fixed picks tabs being too thin

master
Andrey Kleshchev 2022-05-09 20:53:21 +03:00
parent 39ab2fb3fe
commit 76beebae68
7 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpanelprofile.cpp
View File

@ -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<LLIconCtrl>("2nd_life_pic");
mSecondLifePicLayout = getChild<LLPanel>("image_stack");
mDescriptionEdit = getChild<LLTextEditor>("sl_description_edit");
mNotesSnippet = getChild<LLTextEditor>("notes_snippet");
mAgentActionMenuButton = getChild<LLMenuButton>("agent_actions_menu");
mSaveDescriptionChanges = getChild<LLButton>("save_description_changes");
mDiscardDescriptionChanges = getChild<LLButton>("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",

6
indra/newview/llpanelprofile.h
View File

@ -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;

6
indra/newview/llpanelprofileclassifieds.cpp
View File

@ -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"]);

4
indra/newview/llpanelprofilepicks.cpp
View File

@ -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())

20
indra/newview/skins/default/xui/en/panel_profile_pick.xml
View File

@ -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 @@
<button
name="teleport_btn"
label="Teleport"
bottom="-40"
bottom="-27"
left="10"
height="20"
width="80"
width="100"
follows="left|bottom"
layout="topleft"
/>
@ -79,7 +79,7 @@
name="show_on_map_btn"
label="Show on Map"
bottom_delta="0"
left_pad="5"
left_pad="7"
height="20"
width="100"
follows="left|bottom"
@ -89,8 +89,8 @@
name="set_to_curr_location_btn"
label="Set Location"
tool_tip="Set to Current Location"
bottom_delta="0"
left_pad="5"
bottom="-3"
left="10"
height="20"
width="100"
follows="left|bottom"
@ -100,8 +100,8 @@
<button
name="save_changes_btn"
label="Save Pick"
bottom="-15"
left="10"
bottom_delta="0"
left_pad="7"
height="20"
width="100"
follows="left|bottom"

1
indra/newview/skins/default/xui/en/panel_profile_picks.xml
View File

@ -66,6 +66,7 @@
bottom="-5"
left="4"
right="-4"
tab_width="150"
follows="all"
layout="topleft"
halign="left"

2
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
View File

@ -371,7 +371,7 @@ Account: [ACCTTYPE]
border_visible="true"
font="SansSerifSmall"
h_pad="2"
max_length="65000"
max_length="1000"
parse_urls="true"
word_wrap="true"/>
</layout_panel>