From b3d0c94ee0e79a6cd8ee594ec129b0215c56794a Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 29 Dec 2009 16:23:49 -0800 Subject: 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. --- indra/newview/llviewerfloaterreg.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llviewerfloaterreg.cpp') 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); LLFloaterReg::add("whitelist_entry", "floater_whitelist_entry.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); + LLFloaterWindowSizeUtil::registerFloater(); LLFloaterReg::add("world_map", "floater_world_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // *NOTE: Please keep these alphabetized for easier merges -- cgit v1.2.3 From 0458c879483216e4b823db72ff5ee1a94c407cc8 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 30 Dec 2009 19:09:27 +0200 Subject: Work on task EXT-938 (Get rid of deprecated list controls) -- remove unused LLFloaterCall & LLPanelAvatarRow used in it. --HG-- branch : product-engine --- indra/newview/llviewerfloaterreg.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llviewerfloaterreg.cpp') diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 00db11a767..3a6c09f31f 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -53,7 +53,6 @@ #include "llfloaterbuyland.h" #include "llfloaterbulkpermission.h" #include "llfloaterbump.h" -#include "llfloatercall.h" #include "llfloatercamera.h" #include "llfloaterchat.h" #include "llfloaterchatterbox.h" -- cgit v1.2.3