Second Life viewer sources 1.20.2

1 files changed, 37 insertions, 18 deletions

diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp
index 2786a34..ee78eaa 100644
--- a/linden/indra/newview/llfloaterbuyland.cpp
+++ b/linden/indra/newview/llfloaterbuyland.cpp
@@ -53,7 +53,7 @@
 #include "lltexturectrl.h"
 #include "llviewchildren.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llviewertexteditor.h"
@@ -187,6 +187,7 @@ public:
         virtual void draw();
         virtual BOOL canClose();
         virtual void onClose(bool app_quitting);
+        /*virtual*/ void setMinimized(BOOL b);
         
 private:
         class SelectionObserver : public LLParcelObserver
@@ -290,7 +291,7 @@ LLFloaterBuyLandUI* LLFloaterBuyLandUI::soleInstance(bool createIfNeeded)
         {
                 sInstance = new LLFloaterBuyLandUI();
 
-                gUICtrlFactory->buildFloater(sInstance, "floater_buy_land.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_buy_land.xml");
                 sInstance->center();
 
                 static bool observingCacheName = false;
@@ -304,7 +305,7 @@ LLFloaterBuyLandUI* LLFloaterBuyLandUI::soleInstance(bool createIfNeeded)
                 if (!parcelSelectionObserver)
                 {
                         parcelSelectionObserver = new SelectionObserver;
-                        gParcelMgr->addObserver(parcelSelectionObserver);
+                        LLViewerParcelMgr::getInstance()->addObserver(parcelSelectionObserver);
                 }
         }
         
@@ -333,7 +334,7 @@ LLFloaterBuyLandUI::~LLFloaterBuyLandUI()
 {
         delete mTransaction;
 
-        gParcelMgr->deleteParcelBuy(mParcelBuyInfo);
+        LLViewerParcelMgr::getInstance()->deleteParcelBuy(mParcelBuyInfo);
         
         if (sInstance == this)
         {
@@ -346,14 +347,14 @@ void LLFloaterBuyLandUI::SelectionObserver::changed()
         LLFloaterBuyLandUI* ui = LLFloaterBuyLandUI::soleInstance(false);
         if (ui)
         {
-                if (gParcelMgr->selectionEmpty())
+                if (LLViewerParcelMgr::getInstance()->selectionEmpty())
                 {
                         ui->close();
                 }
                 else {
                         ui->setParcel(
-                                gParcelMgr->getSelectionRegion(),
-                                gParcelMgr->getParcelSelection());
+                                LLViewerParcelMgr::getInstance()->getSelectionRegion(),
+                                LLViewerParcelMgr::getInstance()->getParcelSelection());
                 }
         }
 }
@@ -430,7 +431,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
                 parcel->getMaxPrimCapacity() * parcel->getParcelPrimBonus()); 
         // Can't have more than region max tasks, regardless of parcel 
         // object bonus factor. 
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion(); 
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); 
         if(region) 
         { 
                 S32 max_tasks_per_region = (S32)region->getMaxTasks(); 
@@ -518,7 +519,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 
 void LLFloaterBuyLandUI::updateCovenantInfo()
 {
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
         if(!region) return;
 
         LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
@@ -728,7 +729,7 @@ void LLFloaterBuyLandUI::runWebSitePrep(const std::string& password)
         }
         
         BOOL remove_contribution = childGetValue("remove_contribution").asBoolean();
-        mParcelBuyInfo = gParcelMgr->setupParcelBuy(gAgent.getID(), gAgent.getSessionID(),
+        mParcelBuyInfo = LLViewerParcelMgr::getInstance()->setupParcelBuy(gAgent.getID(), gAgent.getSessionID(),
                                                 gAgent.getGroupID(), mIsForGroup, mIsClaim, remove_contribution);
 
         if (mParcelBuyInfo
@@ -746,7 +747,7 @@ void LLFloaterBuyLandUI::runWebSitePrep(const std::string& password)
         
         if (mSiteMembershipUpgrade)
         {
-                LLComboBox* levels = LLUICtrlFactory::getComboBoxByName(this, "account_level");
+                LLComboBox* levels = getChild<LLComboBox>( "account_level");
                 if (levels)
                 {
                         mUserPlanChoice = levels->getCurrentIndex();
@@ -797,8 +798,8 @@ void LLFloaterBuyLandUI::sendBuyLand()
 {
         if (mParcelBuyInfo)
         {
-                gParcelMgr->sendParcelBuy(mParcelBuyInfo);
-                gParcelMgr->deleteParcelBuy(mParcelBuyInfo);
+                LLViewerParcelMgr::getInstance()->sendParcelBuy(mParcelBuyInfo);
+                LLViewerParcelMgr::getInstance()->deleteParcelBuy(mParcelBuyInfo);
                 mBought = true;
         }
 }
@@ -968,9 +969,27 @@ void LLFloaterBuyLandUI::draw()
         }
 }
 
+// virtual
 BOOL LLFloaterBuyLandUI::canClose()
 {
-        return (mTransaction ? FALSE : TRUE) && mCurrency.canCancel();
+        bool can_close = (mTransaction ? FALSE : TRUE) && mCurrency.canCancel();
+        if (!can_close)
+        {
+                // explain to user why they can't do this, see DEV-9605
+                gViewerWindow->alertXml("CannotCloseFloaterBuyLand");
+        }
+        return can_close;
+}
+
+// virtual
+void LLFloaterBuyLandUI::setMinimized(BOOL minimize)
+{
+        bool restored = (isMinimized() && !minimize);
+        LLFloater::setMinimized(minimize);
+        if (restored)
+        {
+                refreshUI();
+        }
 }
 
 void LLFloaterBuyLandUI::onClose(bool app_quitting)
@@ -984,7 +1003,7 @@ void LLFloaterBuyLandUI::refreshUI()
 {
         // section zero: title area
         {
-                LLTextureCtrl* snapshot = LLViewerUICtrlFactory::getTexturePickerByName(this, "info_image");
+                LLTextureCtrl* snapshot = getChild<LLTextureCtrl>("info_image");
                 if (snapshot)
                 {
                         snapshot->setImageAssetID(
@@ -1042,7 +1061,7 @@ void LLFloaterBuyLandUI::refreshUI()
                                 ? LLViewChildren::BADGE_ERROR
                                 : LLViewChildren::BADGE_WARN);
                 
-                LLTextBox* message = LLUICtrlFactory::getTextBoxByName(this, "error_message");
+                LLTextBox* message = getChild<LLTextBox>("error_message");
                 if (message)
                 {
                         message->setVisible(true);
@@ -1076,7 +1095,7 @@ void LLFloaterBuyLandUI::refreshUI()
                                 :       getString("cant_own_land")
                         );
                 
-                LLComboBox* levels = LLUICtrlFactory::getComboBoxByName(this, "account_level");
+                LLComboBox* levels = getChild<LLComboBox>( "account_level");
                 if (levels)
                 {
                         levels->setVisible(mSiteMembershipUpgrade);
@@ -1277,7 +1296,7 @@ void LLFloaterBuyLandUI::startBuyPreConfirm()
                 action += mSiteMembershipAction;
                 action += "\n";
 
-                LLComboBox* levels = LLUICtrlFactory::getComboBoxByName(this, "account_level");
+                LLComboBox* levels = getChild<LLComboBox>( "account_level");
                 if (levels)
                 {
                         action += " * ";