diff options
| author | James Cook <james@lindenlab.com> | 2009-12-29 16:23:49 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-29 16:23:49 -0800 |
| commit | b3d0c94ee0e79a6cd8ee594ec129b0215c56794a (patch) | |
| tree | 599d3b24d5f2a9161f4e6818875e18aca328f329 /indra/newview/llviewerfloaterreg.cpp | |
| parent | c2915a889987e64484c9794d55740e7f6ac8f9bd (diff) | |
EXT-3720 Added Advanced > Set Window Size... for video making
Torley needed this to make tutorial movies.
Removed dead code from Preferences.
Reviewed by Leyla.
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 00db11a767..5e624eeec7 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -111,6 +111,7 @@ #include "llfloaterwater.h" #include "llfloaterwhitelistentry.h" #include "llfloaterwindlight.h" +#include "llfloaterwindowsize.h" #include "llfloaterworldmap.h" #include "llimfloatercontainer.h" #include "llinspectavatar.h" @@ -260,6 +261,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("voice_controls", "floater_voice_controls.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLCallFloater>); LLFloaterReg::add("whitelist_entry", "floater_whitelist_entry.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWhiteListEntry>); + LLFloaterWindowSizeUtil::registerFloater(); LLFloaterReg::add("world_map", "floater_world_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWorldMap>); // *NOTE: Please keep these alphabetized for easier merges |