diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
commit | ade6bbb06c6a842f39a3fe32decf7c66682df092 (patch) | |
tree | 8fa1e4ba680f916bb4c77c70f2464f295a3bd3f3 /indra/newview/llfloaterauction.cpp | |
parent | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (diff) |
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llfloaterauction.cpp')
-rw-r--r-- | indra/newview/llfloaterauction.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp index e1974bba84..8ad5a19d02 100644 --- a/indra/newview/llfloaterauction.cpp +++ b/indra/newview/llfloaterauction.cpp @@ -75,7 +75,9 @@ LLFloaterAuction::LLFloaterAuction(const LLSD& key) : LLFloater(), mParcelID(-1) { - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml"); +// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml"); + mCommitCallbackRegistrar.add("ClickSnapshot", boost::bind(&LLFloaterAuction::onClickSnapshot, this)); + mCommitCallbackRegistrar.add("ClickOK", boost::bind(&LLFloaterAuction::onClickOK, this)); } // Destroys the object @@ -85,11 +87,6 @@ LLFloaterAuction::~LLFloaterAuction() BOOL LLFloaterAuction::postBuild() { - childSetValue("fence_check", LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) ); - getChild<LLUICtrl>("fence_check")->setCommitCallback(boost::bind(LLSavedSettingsGlue::setBOOL, _1, "AuctionShowFence")); - - childSetAction("snapshot_btn", onClickSnapshot, this); - childSetAction("ok_btn", onClickOK, this); return TRUE; } |