diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-21 09:13:19 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-21 09:13:19 -0700 |
| commit | f07dc421e81d945531dc6f4befc19ea4fe4b9a47 (patch) | |
| tree | 7ac8fa1fbfad64c616161488a5d0be10c1eaba34 /indra/newview/llfloaterland.cpp | |
| parent | 8b3957b310afa23e543c3eb33aca9131dba52b31 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index ac47253444..fcf836f4a0 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -45,7 +45,6 @@ #include "llcombobox.h" #include "llfloaterreg.h" #include "llfloateravatarpicker.h" -#include "llfloaterauction.h" #include "llfloatergroups.h" #include "llfloaterscriptlimits.h" #include "llavataractions.h" @@ -80,6 +79,7 @@ #include "llpanelexperiencepicker.h" #include "llpanelenvironment.h" #include "llexperiencecache.h" +#include "llweb.h" #include "llgroupactions.h" #include "llenvironment.h" @@ -574,7 +574,6 @@ void LLPanelLandGeneral::refresh() mBtnDeedToGroup->setEnabled(FALSE); mBtnSetGroup->setEnabled(FALSE); - mBtnStartAuction->setEnabled(FALSE); mCheckDeedToGroup ->set(FALSE); mCheckDeedToGroup ->setEnabled(FALSE); @@ -672,7 +671,6 @@ void LLPanelLandGeneral::refresh() mTextClaimDate->setEnabled(FALSE); mTextGroup->setText(getString("none_text")); mTextGroup->setEnabled(FALSE); - mBtnStartAuction->setEnabled(FALSE); } else { @@ -724,11 +722,6 @@ void LLPanelLandGeneral::refresh() LLStringUtil::format (claim_date_str, substitution); mTextClaimDate->setText(claim_date_str); mTextClaimDate->setEnabled(is_leased); - - BOOL enable_auction = (gAgent.getGodLevel() >= GOD_LIAISON) - && (owner_id == GOVERNOR_LINDEN_ID) - && (parcel->getAuctionID() == 0); - mBtnStartAuction->setEnabled(enable_auction); } // Display options @@ -1056,20 +1049,8 @@ void LLPanelLandGeneral::onClickBuyPass(void* data) // static void LLPanelLandGeneral::onClickStartAuction(void* data) { - LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data; - LLParcel* parcelp = panelp->mParcel->getParcel(); - if(parcelp) - { - if(parcelp->getForSale()) - { - LLNotificationsUtil::add("CannotStartAuctionAlreadyForSale"); - } - else - { - //LLFloaterAuction::showInstance(); - LLFloaterReg::showInstance("auction"); - } - } + std::string auction_url = "https://places.[GRID]/auctions/"; + LLWeb::loadURLExternal(LLWeb::expandURLSubstitutions(auction_url, LLSD())); } // static |