summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbump.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-15 14:05:16 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-15 14:05:16 -0800
commit9cf8c3e654f38745c8a94cbd85609a17f482266a (patch)
tree8cd1586fef29a307b9ab2bbe3711d289efdeb871 /indra/newview/llfloaterbump.cpp
parent1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff)
parent77aa787c019615d2fe68d31aa07434301535c992 (diff)
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Diffstat (limited to 'indra/newview/llfloaterbump.cpp')
-rw-r--r--indra/newview/llfloaterbump.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index 68f06b1e5b..e925796526 100644
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -33,11 +33,11 @@
#include "llviewerprecompiledheaders.h"
-#include "llfloaterbump.h"
+#include "llsd.h"
+#include "mean_collision_data.h"
+#include "llfloaterbump.h"
#include "llscrolllistctrl.h"
-
-#include "llsd.h"
#include "lluictrlfactory.h"
#include "llviewermessage.h"