summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-07-30 19:15:46 -0700
committerRichard Linden <none@none>2013-07-30 19:15:46 -0700
commit5762c1d0d727f0050aefe7126ab2d5280bebfb9b (patch)
tree78bdcc931460dfc45d35cd1707ddf1afdf049a2e /indra/newview/llvowater.cpp
parent4cca9ba279f908f206fa5e32adccf1038f05cc7f (diff)
parent910874a7e32bdfc456474e2d0ee84d190be3011e (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rwxr-xr-xindra/newview/llvowater.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index 50e7ed7bb5..fc85a670b5 100755
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -28,7 +28,6 @@
#include "llvowater.h"
-#include "imageids.h"
#include "llviewercontrol.h"
#include "lldrawable.h"