diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
| commit | fbf49910f34278a39dffff7e6c8bc654839988fb (patch) | |
| tree | 627ae5b2818f671898b855d5ef8d02a9789d9432 /indra/newview/llfloaterbuyland.cpp | |
| parent | c618a55f769946369e3d80f71eeb3c42042ab4e0 (diff) | |
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llfloaterbuyland.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuyland.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index cf73a1104d..52ac981909 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -241,6 +241,17 @@ void LLFloaterBuyLand::updateEstateOwnerName(const std::string& name) } // static +BOOL LLFloaterBuyLand::isOpen() +{ + LLFloaterBuyLandUI* floater = LLFloaterBuyLandUI::soleInstance(FALSE); + if (floater) + { + return floater->getVisible(); + } + return FALSE; +} + +// static LLFloaterBuyLandUI* LLFloaterBuyLandUI::sInstance = NULL; // static @@ -717,10 +728,11 @@ void LLFloaterBuyLandUI::runWebSitePrep(const std::string& password) mParcelBuyInfo = gParcelMgr->setupParcelBuy(gAgent.getID(), gAgent.getSessionID(), gAgent.getGroupID(), mIsForGroup, mIsClaim, remove_contribution); - if (!mSiteMembershipUpgrade - && !mSiteLandUseUpgrade - && mCurrency.getAmount() == 0 - && mSiteConfirm != "password") + if (mParcelBuyInfo + && !mSiteMembershipUpgrade + && !mSiteLandUseUpgrade + && mCurrency.getAmount() == 0 + && mSiteConfirm != "password") { sendBuyLand(); return; @@ -779,10 +791,12 @@ void LLFloaterBuyLandUI::finishWebSitePrep() void LLFloaterBuyLandUI::sendBuyLand() { - gParcelMgr->sendParcelBuy(mParcelBuyInfo); - gParcelMgr->deleteParcelBuy(mParcelBuyInfo); - - mBought = true; + if (mParcelBuyInfo) + { + gParcelMgr->sendParcelBuy(mParcelBuyInfo); + gParcelMgr->deleteParcelBuy(mParcelBuyInfo); + mBought = true; + } } void LLFloaterBuyLandUI::updateNames() |