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

SL-18776 Fix handling for an empty avatar list

master
Andrey Kleshchev 2022-12-09 07:44:27 +02:00
parent 8496ae48dd
commit b79c4e47a8
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloateravatarpicker.cpp
View File

@ -680,7 +680,12 @@ void LLFloaterAvatarPicker::processResponse(const LLUUID& query_id, const LLSD&
// clear "Searching" label on first results
search_results->deleteAllItems();
if (content.has("agents"))
if (content.has("failure_reason"))
{
getChild<LLScrollListCtrl>("SearchResults")->setCommentText(content["failure_reason"].asString());
getChildView("ok_btn")->setEnabled(false);
}
else
{
LLSD agents = content["agents"];
@ -733,10 +738,6 @@ void LLFloaterAvatarPicker::processResponse(const LLUUID& query_id, const LLSD&
search_results->setFocus(TRUE);
}
}
else if (content.has("failure_reason"))
{
getChild<LLScrollListCtrl>("SearchResults")->setCommentText(content["failure_reason"].asString());
}
}
}

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

@ -323,7 +323,6 @@
follows="left|top"
decimal_digits="0"
increment="1"
control_name="Edit Cost"
name="Edit Cost"
label="Price:"
label_width="100"

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

@ -1140,7 +1140,6 @@ even though the user gets a free copy.
decimal_digits="0"
increment="1"
left_pad="0"
control_name="Edit Cost"
name="Edit Cost"
label="L$"
label_width="15"

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

@ -450,7 +450,6 @@
follows="left|top"
decimal_digits="0"
increment="1"
control_name="Edit Cost"
name="Edit Cost"
label="Price: L$"
label_width="75"

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

@ -454,7 +454,6 @@
increment="1"
top_pad="10"
left="120"
control_name="Edit Cost"
name="Edit Cost"
label="Price: L$"
label_width="73"