diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llfloaterauction.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfloaterauction.cpp')
| -rw-r--r-- | indra/newview/llfloaterauction.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp index f1bba7d9c5..faa69f7a03 100644 --- a/indra/newview/llfloaterauction.cpp +++ b/indra/newview/llfloaterauction.cpp @@ -48,7 +48,7 @@ #include "llviewerimagelist.h" #include "llviewerparcelmgr.h" #include "llviewerregion.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" #include "llviewerwindow.h" #include "llviewerdisplay.h" #include "llviewercontrol.h" @@ -74,7 +74,7 @@ LLFloaterAuction::LLFloaterAuction() : LLFloater("floater_auction"), mParcelID(-1) { - gUICtrlFactory->buildFloater(this, "floater_auction.xml"); + LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml"); childSetValue("fence_check", LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) ); @@ -106,8 +106,8 @@ void LLFloaterAuction::show() void LLFloaterAuction::initialize() { - mParcelp = gParcelMgr->getParcelSelection(); - LLViewerRegion* region = gParcelMgr->getSelectionRegion(); + mParcelp = LLViewerParcelMgr::getInstance()->getParcelSelection(); + LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); LLParcel* parcelp = mParcelp->getParcel(); if(parcelp && region && !parcelp->getForSale()) { @@ -141,7 +141,7 @@ void LLFloaterAuction::draw() { LLFloater::draw(); - if(getVisible() && !isMinimized() && mImage.notNull()) + if(!isMinimized() && mImage.notNull()) { LLRect rect; if (childGetRect("snapshot_icon", rect)) |