diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-08 13:05:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-08 13:05:29 -0600 |
| commit | c431ddf629b7f1149c44b2063d216dd34bcd2b12 (patch) | |
| tree | 7c625873abf2ad80fc25e90e073ff0fcc2e619ab /indra/newview/llfloaterland.cpp | |
| parent | b76b81ff811014012856f58970c1aac093507557 (diff) | |
| parent | 8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
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); + } } |