diff options
author | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
commit | b8c1976460374e743743728ef49b38ad52c453a4 (patch) | |
tree | 4f340d954ae3552d4dbb87b389d15d98d66eba51 /indra/newview/llfloaterregioninfo.cpp | |
parent | 7a0fb4fece5a92627caa08622e9584a903a3fa1d (diff) | |
parent | 4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
-rwxr-xr-x | indra/newview/llfloaterregioninfo.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 94f3a45d88..aed3294189 100755 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -2025,6 +2025,8 @@ void LLPanelEstateInfo::updateControls(LLViewerRegion* region) BOOL manager = (region && region->isEstateManager()); setCtrlsEnabled(god || owner || manager); + getChildView("apply_btn")->setEnabled(FALSE); + BOOL has_allowed_avatar = getChild<LLNameListCtrl>("allowed_avatar_name_list")->getFirstSelected() ? TRUE : FALSE; BOOL has_allowed_group = getChild<LLNameListCtrl>("allowed_group_name_list")->getFirstSelected() ? TRUE : FALSE; BOOL has_banned_agent = getChild<LLNameListCtrl>("banned_avatar_name_list")->getFirstSelected() ? TRUE : FALSE; |