summaryrefslogtreecommitdiff
path: root/indra/newview/llwlparammanager.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-15 17:53:03 -0800
committercallum <none@none>2009-12-15 17:53:03 -0800
commitb7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch)
tree7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llwlparammanager.cpp
parentf923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff)
parentfc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff)
Merge with tip before push
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
-rw-r--r--indra/newview/llwlparammanager.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index c3a70705cf..7cac564619 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -42,17 +42,12 @@
#include "llspinctrl.h"
#include "llcheckboxctrl.h"
#include "lluictrlfactory.h"
-#include "llviewercamera.h"
#include "llcombobox.h"
#include "lllineeditor.h"
#include "llsdserialize.h"
#include "v4math.h"
-#include "llviewerdisplay.h"
#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "lldrawpoolwater.h"
-#include "llviewerregion.h"
#include "llwlparamset.h"
#include "llpostprocess.h"