diff options
author | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
commit | d5f48181b50d9e941abafd76692359869e71a36d (patch) | |
tree | 66f2a744ca09c0ff483038ed639a5dd552cd5272 /indra/newview/llfloaterwindowsize.cpp | |
parent | 34b1982d33c83bb58c95bcedf36c9b5cd097584f (diff) | |
parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llfloaterwindowsize.cpp')
-rw-r--r-- | indra/newview/llfloaterwindowsize.cpp | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/indra/newview/llfloaterwindowsize.cpp b/indra/newview/llfloaterwindowsize.cpp index a70f2af11a..ec161018b8 100644 --- a/indra/newview/llfloaterwindowsize.cpp +++ b/indra/newview/llfloaterwindowsize.cpp @@ -58,33 +58,12 @@ bool extractWindowSizeFromString(const std::string& instr, U32 *width, U32 *heig } -///---------------------------------------------------------------------------- -/// Class LLFloaterWindowSize -///---------------------------------------------------------------------------- -class LLFloaterWindowSize -: public LLFloater -{ - friend class LLFloaterReg; -private: - LLFloaterWindowSize(const LLSD& key); - virtual ~LLFloaterWindowSize(); - -public: - /*virtual*/ BOOL postBuild(); - void initWindowSizeControls(); - void onClickSet(); - void onClickCancel(); -}; - - LLFloaterWindowSize::LLFloaterWindowSize(const LLSD& key) : LLFloater(key) -{ -} +{} LLFloaterWindowSize::~LLFloaterWindowSize() -{ -} +{} BOOL LLFloaterWindowSize::postBuild() { @@ -145,13 +124,3 @@ void LLFloaterWindowSize::onClickCancel() { closeFloater(); } - -///---------------------------------------------------------------------------- -/// LLFloaterWindowSizeUtil -///---------------------------------------------------------------------------- -void LLFloaterWindowSizeUtil::registerFloater() -{ - LLFloaterReg::add("window_size", "floater_window_size.xml", - &LLFloaterReg::build<LLFloaterWindowSize>); - -} |