summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2010-01-14 11:40:58 +0800
committerangela <angela@lindenlab.com>2010-01-14 11:40:58 +0800
commit82b073be87e332b7653e442ef3fd84af7376da8e (patch)
tree87ef0a697a51b2f62d936d022a86b5aab2043fe9 /indra/newview/llimview.cpp
parent01c65e891d477b2f162cb277a2b06a6d3a4a0e9f (diff)
parent6a2b10d869a1598b3db17b62bc7f5f9bb8dae39e (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"