aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterauction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterauction.cpp')
-rw-r--r--linden/indra/newview/llfloaterauction.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index f0086c4..6b1c3e0 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -48,7 +48,7 @@
48#include "llviewerimagelist.h" 48#include "llviewerimagelist.h"
49#include "llviewerparcelmgr.h" 49#include "llviewerparcelmgr.h"
50#include "llviewerregion.h" 50#include "llviewerregion.h"
51#include "llvieweruictrlfactory.h" 51#include "lluictrlfactory.h"
52#include "llviewerwindow.h" 52#include "llviewerwindow.h"
53#include "llviewerdisplay.h" 53#include "llviewerdisplay.h"
54#include "llviewercontrol.h" 54#include "llviewercontrol.h"
@@ -74,7 +74,7 @@ LLFloaterAuction::LLFloaterAuction() :
74 LLFloater("floater_auction"), 74 LLFloater("floater_auction"),
75 mParcelID(-1) 75 mParcelID(-1)
76{ 76{
77 gUICtrlFactory->buildFloater(this, "floater_auction.xml"); 77 LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml");
78 78
79 childSetValue("fence_check", 79 childSetValue("fence_check",
80 LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) ); 80 LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) );
@@ -106,8 +106,8 @@ void LLFloaterAuction::show()
106 106
107void LLFloaterAuction::initialize() 107void LLFloaterAuction::initialize()
108{ 108{
109 mParcelp = gParcelMgr->getParcelSelection(); 109 mParcelp = LLViewerParcelMgr::getInstance()->getParcelSelection();
110 LLViewerRegion* region = gParcelMgr->getSelectionRegion(); 110 LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
111 LLParcel* parcelp = mParcelp->getParcel(); 111 LLParcel* parcelp = mParcelp->getParcel();
112 if(parcelp && region && !parcelp->getForSale()) 112 if(parcelp && region && !parcelp->getForSale())
113 { 113 {
@@ -141,7 +141,7 @@ void LLFloaterAuction::draw()
141{ 141{
142 LLFloater::draw(); 142 LLFloater::draw();
143 143
144 if(getVisible() && !isMinimized() && mImage.notNull()) 144 if(!isMinimized() && mImage.notNull())
145 { 145 {
146 LLRect rect; 146 LLRect rect;
147 if (childGetRect("snapshot_icon", rect)) 147 if (childGetRect("snapshot_icon", rect))