diff options
author | angela <angela@lindenlab.com> | 2010-01-14 13:02:44 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2010-01-14 13:02:44 +0800 |
commit | 402d2e7c9d58852e63ca00fbb464433089b478e1 (patch) | |
tree | 098d05eebfd7e14ce5048197789f6a9ec0624e5e /indra/newview/llstartup.cpp | |
parent | 8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff) | |
parent | 82b073be87e332b7653e442ef3fd84af7376da8e (diff) |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 99fa271b78..fbc98b7691 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -100,7 +100,7 @@ #include "lleventnotifier.h" #include "llface.h" #include "llfeaturemanager.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llfloaterchat.h" #include "llfloaterhud.h" #include "llfloaterland.h" |