diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
| commit | 27cf0ec7f34887ada651307fe438ef0d627bf67f (patch) | |
| tree | 90611a41d9ad25b98db6899745208c8aab51c150 /indra/newview/llfloaterland.cpp | |
| parent | c6aa86750c22c20dca6895695386e2357b953bbd (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Merge with 3.6.11
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); } |