diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-21 14:08:38 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 14:08:38 -0500 |
| commit | 45bc601563337b99ca3dc0d733196d7a00dd54d7 (patch) | |
| tree | 2d49bf2ce2589947d1b80770f5fa7a312a1f908b /indra/newview/llfloaterland.cpp | |
| parent | 4f2a7167b6d6b3b278b39ea7b97beb89f6abb5ee (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
merge changes for 3.6.11-release
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rwxr-xr-x | indra/newview/llfloaterland.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 2b9c216e54..6c8e81e563 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2545,7 +2545,7 @@ void LLPanelLandAccess::refresh_ui() getChildView("remove_allowed")->setEnabled(FALSE); getChildView("add_banned")->setEnabled(FALSE); getChildView("remove_banned")->setEnabled(FALSE); - + LLParcel *parcel = mParcel->getParcel(); if (parcel) { @@ -2653,7 +2653,7 @@ void LLPanelLandAccess::onCommitPublicAccess(LLUICtrl *ctrl, void *userdata) { return; } - + onCommitAny(ctrl, userdata); } |