diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
| commit | 69c32b04cfd52c6fbd34997fa6485a84435743ef (patch) | |
| tree | 9e95073f5d7109b86ed5fdb06b26dae4416c7146 /indra/newview/llfloaterland.cpp | |
| parent | dc2af90b04a16a41851874b9ab55b4ac61af2d7b (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-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); } |