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

Fix up EAM to work (Part 1)

Browse Source 
Move Copy button to bottom because NO ONE KNOWS HOW TO UI ANYMORE,
I am alone, so alone *single tear*

Don't draw headings on single column lists, it just wastes space
This commit is contained in:
Lirusaito
2019-07-22 08:36:11 -04:00
parent 7d9642210d
commit 31c5b00fed
2 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llfloaterregioninfo.cpp
View File

@@ -306,7 +306,9 @@ void LLFloaterRegionInfo::requestRegionInfo()
tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);
tab->getChild<LLPanel>("Terrain")->setCtrlsEnabled(FALSE);
tab->getChild<LLPanel>("Estate")->setCtrlsEnabled(FALSE);
tab->getChild<LLPanel>("Access")->setCtrlsEnabled(FALSE);
auto panel = tab->getChild<LLPanel>("Access");
panel->setCtrlsEnabled(FALSE);
panel->getChildView("tabs")->setEnabled(true);
// Must allow anyone to request the RegionInfo data
// so non-owners/non-gods can see the values.
@@ -1755,14 +1757,10 @@ BOOL LLPanelEstateInfo::postBuild()
initCtrl("limit_payment");
initCtrl("limit_age_verified");
initCtrl("voice_chat_check");
initHelpBtn("estate_manager_help", "HelpEstateEstateManager");
initHelpBtn("use_global_time_help", "HelpEstateUseGlobalTime");
initHelpBtn("fixed_sun_help", "HelpEstateFixedSun");
initHelpBtn("externally_visible_help", "HelpEstateExternallyVisible");
initHelpBtn("allow_direct_teleport_help", "HelpEstateAllowDirectTeleport");
initHelpBtn("allow_resident_help", "HelpEstateAllowResident");
initHelpBtn("allow_group_help", "HelpEstateAllowGroup");
initHelpBtn("ban_resident_help", "HelpEstateBanResident");
initHelpBtn("voice_chat_help", "HelpEstateVoiceChat");
// Set up the Legacy Estate Environment checkboxes
@@ -2449,11 +2447,14 @@ bool LLDispatchSetEstateAccess::operator()(
}
}
if (panel && panel->getPendingUpdate())
if (panel)
{
panel->setPendingUpdate(false);
panel->onEstateAccessReceived(result); // Until HTTP response use UDP Result
panel->updateLists();
if (panel->getPendingUpdate())
{
panel->setPendingUpdate(false);
panel->updateLists();
}
}
return true;
}
@@ -3331,6 +3332,12 @@ LLPanelEstateAccess::LLPanelEstateAccess()
BOOL LLPanelEstateAccess::postBuild()
{
// set up the callbacks for the generic controls
initHelpBtn("estate_manager_help", "HelpEstateEstateManager");
initHelpBtn("allow_resident_help", "HelpEstateAllowResident");
initHelpBtn("allow_group_help", "HelpEstateAllowGroup");
initHelpBtn("ban_resident_help", "HelpEstateBanResident");
getChild<LLUICtrl>("allowed_avatar_name_list")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
if (avatar_name_list)

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

@@ -76,13 +76,13 @@
layout="topleft"
left_delta="0"
multi_select="true"
draw_heading="true"
draw_heading="false"
name="estate_manager_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="498">
<columns
<column
label="Name"
name="name"
width="498" />
@@ -165,16 +165,7 @@
text_color="Black"
text_pad_left="10"
bottom="-27"
width="440" />
<button
follows="left|top"
bottom_delta="-1"
height="24"
label="Copy"
layout="topleft"
left_delta="440"
name="copy_allowed_list_btn"
width="60" />
right="-1" />
</panel>
<!-- Always allowed box -->
<view_border
@@ -191,13 +182,13 @@
layout="topleft"
left_delta="0"
multi_select="true"
draw_heading="true"
draw_heading="false"
name="allowed_avatar_name_list"
menu_num="0"
name_system="LandManagementNameSystem"
bottom_delta="0"
width="498">
<columns
<column
label="Name"
name="name"
width="498" />
@@ -221,6 +212,15 @@
left_delta="123"
bottom_delta="0"
width="114" />
<button
follows="left|top"
bottom_delta="0"
height="23"
label="Copy"
layout="topleft"
left_delta="123"
name="copy_allowed_list_btn"
width="114" />
</panel>
<!-- ============================= ALLOWED GROUPS tab ======================= -->
@@ -279,16 +279,7 @@
text_color="Black"
text_pad_left="10"
bottom="-27"
width="440" />
<button
follows="left|top"
bottom_delta="-1"
height="24"
label="Copy"
layout="topleft"
left_delta="440"
name="copy_allowed_group_list_btn"
width="60" />
right="-1" />
</panel>
<!-- Groups always allowed box -->
<view_border
@@ -305,11 +296,11 @@
layout="topleft"
left_delta="0"
multi_select="true"
draw_heading="true"
draw_heading="false"
name="allowed_group_name_list"
bottom_delta="0"
width="498">
<columns
<column
label="Name"
name="name"
width="498" />
@@ -333,6 +324,15 @@
left_delta="123"
bottom_delta="0"
width="114" />
<button
follows="left|top"
bottom_delta="0"
height="23"
label="Copy"
layout="topleft"
left_delta="123"
name="copy_allowed_group_list_btn"
width="114" />
</panel>
<!-- ================================ BANNED tab ============================ -->
@@ -391,16 +391,7 @@
text_color="Black"
text_pad_left="10"
bottom="-27"
width="440" />
<button
follows="left|top"
bottom_delta="-1"
height="24"
label="Copy"
layout="topleft"
left_delta="440"
name="copy_banned_list_btn"
width="60" />
right="-1" />
</panel>
<!-- Always banned box -->
<view_border
@@ -423,19 +414,19 @@
name_system="LandManagementNameSystem"
bottom_delta="0"
width="498">
<columns
<column
label="Name"
name="name"
width="140" />
<columns
<column
label="Last login date"
name="last_login_date"
width="100" />
<columns
<column
label="Date banned"
name="ban_date"
width="100" />
<columns
<column
label="Banned by"
name="bannedby"
width="140" />
@@ -459,6 +450,15 @@
left_delta="123"
bottom_delta="0"
width="114" />
<button
follows="left|top"
bottom_delta="0"
height="23"
label="Copy"
layout="topleft"
left_delta="123"
name="copy_banned_list_btn"
width="114" />
</panel>