diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
| commit | 9b42503379bc2e9698545543670306961f7db991 (patch) | |
| tree | dad8c7ac114c65b70c5b6ec6cdc803d7307b365d /indra/newview/llfloaterland.cpp | |
| parent | 4514d8c5c3bd5e16ba8d84214ecd164cd0740864 (diff) | |
| parent | d993d6347a2c9f559d9ee8c5ac8e9292944156f0 (diff) | |
merge latest changes from Ima with 3.6.14-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); } |