Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore Access Management lists' sort orders after populating them

Browse Source
This commit is contained in:
Lirusaito
2019-08-02 20:09:11 -04:00
parent 37c6636788
commit 2cc41405d2
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloaterland.cpp
View File

@@ -2538,6 +2538,7 @@ void LLPanelLandAccess::refresh()
if (mListAccess) if (mListAccess)
{ {
// Clear the sort order so we don't re-sort on every add. // Clear the sort order so we don't re-sort on every add.
const auto order = mListAccess->getSortOrder();
mListAccess->clearSortOrder(); mListAccess->clearSortOrder();
mListAccess->deleteAllItems(); mListAccess->deleteAllItems();
S32 count = parcel->mAccessList.size(); S32 count = parcel->mAccessList.size();
@@ -2568,13 +2569,14 @@ void LLPanelLandAccess::refresh()
} }
mListAccess->addElement(item); mListAccess->addElement(item);
} }
mListAccess->sortByName(TRUE); mListAccess->setSortOrder(order);
} }
// Ban List // Ban List
if(mListBanned) if(mListBanned)
{ {
// Clear the sort order so we don't re-sort on every add. // Clear the sort order so we don't re-sort on every add.
const auto order = mListBanned->getSortOrder();
mListBanned->clearSortOrder(); mListBanned->clearSortOrder();
mListBanned->deleteAllItems(); mListBanned->deleteAllItems();
S32 count = parcel->mBanList.size(); S32 count = parcel->mBanList.size();
@@ -2605,7 +2607,7 @@ void LLPanelLandAccess::refresh()
} }
mListBanned->addElement(item); mListBanned->addElement(item);
} }
mListBanned->sortByName(TRUE); mListBanned->setSortOrder(order);
} }
if(parcel->getRegionDenyAnonymousOverride()) if(parcel->getRegionDenyAnonymousOverride())

12
indra/newview/llfloaterregioninfo.cpp
View File

@@ -4139,6 +4139,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
std::string msg = LLTrans::getString("RegionInfoAllowedResidents", args); std::string msg = LLTrans::getString("RegionInfoAllowedResidents", args);
panel->getChild<LLUICtrl>("allow_resident_label")->setValue(LLSD(msg)); panel->getChild<LLUICtrl>("allow_resident_label")->setValue(LLSD(msg));
const auto order = allowed_agent_name_list->getSortOrder();
allowed_agent_name_list->clearSortOrder(); allowed_agent_name_list->clearSortOrder();
allowed_agent_name_list->deleteAllItems(); allowed_agent_name_list->deleteAllItems();
for (LLSD::array_const_iterator it = result["AllowedAgents"].beginArray(); it != result["AllowedAgents"].endArray(); ++it) for (LLSD::array_const_iterator it = result["AllowedAgents"].beginArray(); it != result["AllowedAgents"].endArray(); ++it)
@@ -4146,7 +4147,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
LLUUID id = (*it)["id"].asUUID(); LLUUID id = (*it)["id"].asUUID();
allowed_agent_name_list->addNameItem(id); allowed_agent_name_list->addNameItem(id);
} }
allowed_agent_name_list->sortByName(TRUE); allowed_agent_name_list->setSortOrder(order);
} }
LLNameListCtrl* banned_agent_name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list"); LLNameListCtrl* banned_agent_name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");
@@ -4158,6 +4159,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
std::string msg = LLTrans::getString("RegionInfoBannedResidents", args); std::string msg = LLTrans::getString("RegionInfoBannedResidents", args);
panel->getChild<LLUICtrl>("ban_resident_label")->setValue(LLSD(msg)); panel->getChild<LLUICtrl>("ban_resident_label")->setValue(LLSD(msg));
const auto order = banned_agent_name_list->getSortOrder();
banned_agent_name_list->clearSortOrder(); banned_agent_name_list->clearSortOrder();
banned_agent_name_list->deleteAllItems(); banned_agent_name_list->deleteAllItems();
static const auto na = LLTrans::getString("na"); static const auto na = LLTrans::getString("na");
@@ -4190,7 +4192,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
banned_agent_name_list->addElement(item); banned_agent_name_list->addElement(item);
} }
banned_agent_name_list->sortByName(TRUE); banned_agent_name_list->setSortOrder(order);
} }
LLNameListCtrl* allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list"); LLNameListCtrl* allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list");
@@ -4202,6 +4204,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
std::string msg = LLTrans::getString("RegionInfoAllowedGroups", args); std::string msg = LLTrans::getString("RegionInfoAllowedGroups", args);
panel->getChild<LLUICtrl>("allow_group_label")->setValue(LLSD(msg)); panel->getChild<LLUICtrl>("allow_group_label")->setValue(LLSD(msg));
const auto order = allowed_group_name_list->getSortOrder();
allowed_group_name_list->clearSortOrder(); allowed_group_name_list->clearSortOrder();
allowed_group_name_list->deleteAllItems(); allowed_group_name_list->deleteAllItems();
for (LLSD::array_const_iterator it = result["AllowedGroups"].beginArray(); it != result["AllowedGroups"].endArray(); ++it) for (LLSD::array_const_iterator it = result["AllowedGroups"].beginArray(); it != result["AllowedGroups"].endArray(); ++it)
@@ -4209,7 +4212,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
LLUUID id = (*it)["id"].asUUID(); LLUUID id = (*it)["id"].asUUID();
allowed_group_name_list->addGroupNameItem(id); allowed_group_name_list->addGroupNameItem(id);
} }
allowed_group_name_list->sortByName(TRUE); allowed_group_name_list->setSortOrder(order);
} }
LLNameListCtrl* estate_manager_name_list = panel->getChild<LLNameListCtrl>("estate_manager_name_list"); LLNameListCtrl* estate_manager_name_list = panel->getChild<LLNameListCtrl>("estate_manager_name_list");
@@ -4221,6 +4224,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
std::string msg = LLTrans::getString("RegionInfoEstateManagers", args); std::string msg = LLTrans::getString("RegionInfoEstateManagers", args);
panel->getChild<LLUICtrl>("estate_manager_label")->setValue(LLSD(msg)); panel->getChild<LLUICtrl>("estate_manager_label")->setValue(LLSD(msg));
const auto order = estate_manager_name_list->getSortOrder();
estate_manager_name_list->clearSortOrder(); estate_manager_name_list->clearSortOrder();
estate_manager_name_list->deleteAllItems(); estate_manager_name_list->deleteAllItems();
for (LLSD::array_const_iterator it = result["Managers"].beginArray(); it != result["Managers"].endArray(); ++it) for (LLSD::array_const_iterator it = result["Managers"].beginArray(); it != result["Managers"].endArray(); ++it)
@@ -4228,7 +4232,7 @@ void LLPanelEstateAccess::onEstateAccessReceived(const LLSD& result)
LLUUID id = (*it)["agent_id"].asUUID(); LLUUID id = (*it)["agent_id"].asUUID();
estate_manager_name_list->addNameItem(id); estate_manager_name_list->addNameItem(id);
} }
estate_manager_name_list->sortByName(TRUE); estate_manager_name_list->setSortOrder(order);
} }

11
indra/newview/skins/default/xui/en-us/panel_region_access.xml
View File

@@ -29,8 +29,6 @@
<panel <panel
background_opaque="true" background_opaque="true"
background_visible="true" background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1" bottom="-1"
follows="all" follows="all"
label="Estate Managers" label="Estate Managers"
@@ -79,6 +77,7 @@
draw_heading="false" draw_heading="false"
name="estate_manager_name_list" name="estate_manager_name_list"
menu_num="0" menu_num="0"
sort_column="0"
name_system="LandManagementNameSystem" name_system="LandManagementNameSystem"
bottom_delta="0" bottom_delta="0"
width="498"> width="498">
@@ -113,8 +112,6 @@
<panel <panel
background_opaque="true" background_opaque="true"
background_visible="true" background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1" bottom="-1"
follows="all" follows="all"
label="Allowed" label="Allowed"
@@ -185,6 +182,7 @@
draw_heading="false" draw_heading="false"
name="allowed_avatar_name_list" name="allowed_avatar_name_list"
menu_num="0" menu_num="0"
sort_column="0"
name_system="LandManagementNameSystem" name_system="LandManagementNameSystem"
bottom_delta="0" bottom_delta="0"
width="498"> width="498">
@@ -227,8 +225,6 @@
<panel <panel
background_opaque="true" background_opaque="true"
background_visible="true" background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1" bottom="-1"
follows="all" follows="all"
label="Allowed Groups" label="Allowed Groups"
@@ -339,8 +335,6 @@
<panel <panel
background_opaque="true" background_opaque="true"
background_visible="true" background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
bottom="-1" bottom="-1"
follows="all" follows="all"
label="Banned" label="Banned"
@@ -411,6 +405,7 @@
draw_heading="true" draw_heading="true"
name="banned_avatar_name_list" name="banned_avatar_name_list"
menu_num="0" menu_num="0"
sort_column="0"
name_system="LandManagementNameSystem" name_system="LandManagementNameSystem"
bottom_delta="0" bottom_delta="0"
width="498"> width="498">