diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-11 14:26:56 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-11 14:26:56 +0200 |
| commit | 5aecd0b93f6d79ef447aca241b082f0fb468d78b (patch) | |
| tree | 81dd8069b29ffaf5a468c5c32d3cf6415481fdb8 /indra/newview/llappviewer.cpp | |
| parent | ce621eafd8a115cc6c13a124453bbbda1bc43e13 (diff) | |
| parent | 4fc7b91a795fb4ad0eaf3b6c7a1779679889fcbf (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9a1b749ba7..2fc7a630ae 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -39,7 +39,6 @@ #include "llfeaturemanager.h" #include "lluictrlfactory.h" #include "lltexteditor.h" -#include "llalertdialog.h" #include "llerrorcontrol.h" #include "llviewertexturelist.h" #include "llgroupmgr.h" @@ -109,7 +108,6 @@ #include "apr_dso.h" #include <boost/lexical_cast.hpp> -#include "llnotify.h" #include "llviewerkeyboard.h" #include "lllfsthread.h" #include "llworkerthread.h" |