diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
| commit | 8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3 (patch) | |
| tree | 30f038fde12f74908f94be9079cdee759481c5a0 /indra/newview/llfloaterland.cpp | |
| parent | 66c75202a8a99adeb7de443ce5ebe3d834f91c24 (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge up to 3.4.5-release
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 55f3d548ec..be743d57d2 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -783,8 +783,9 @@ void LLPanelLandGeneral::refresh() mBtnReleaseLand->setEnabled( can_release ); } - BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST) && !LLViewerParcelMgr::getInstance()->isCollisionBanned();; + BOOL use_pass = parcel->getOwnerID()!= gAgent.getID() && parcel->getParcelFlag(PF_USE_PASS_LIST) && !LLViewerParcelMgr::getInstance()->isCollisionBanned();; mBtnBuyPass->setEnabled(use_pass); + } } |