diff options
author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
---|---|---|
committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
commit | 2f785135bc39575ec306b2b057e446e61c5369d7 (patch) | |
tree | 8c2e6a03962b24700694c6887dacd1558df7cde9 /indra/newview/llstartup.cpp | |
parent | 31e4b6e79ccd0a0451de3fa6a487f775d9f45497 (diff) | |
parent | b214180ac189f6c6347347c5d3a5dc7035e0c039 (diff) |
Merge with viewer 2.
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 83f773fadc..025dd6029a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -121,7 +121,6 @@ #include "lllogininstance.h" // Host the login module. #include "llpanellogin.h" #include "llmutelist.h" -#include "llpanelavatar.h" #include "llavatarpropertiesprocessor.h" #include "llfloaterevent.h" #include "llpanelclassified.h" |