summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2010-01-14 13:02:44 +0800
committerangela <angela@lindenlab.com>2010-01-14 13:02:44 +0800
commit402d2e7c9d58852e63ca00fbb464433089b478e1 (patch)
tree098d05eebfd7e14ce5048197789f6a9ec0624e5e /indra/newview/llimview.cpp
parent8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff)
parent82b073be87e332b7653e442ef3fd84af7376da8e (diff)
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index e9661003ea..f751fa2273 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -80,7 +80,7 @@
#include "llrecentpeople.h"
#include "llsyswellwindow.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
#include "llagentui.h"
#include "lltextutil.h"