diff options
| author | skolb <none@none> | 2009-12-15 13:31:18 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-15 13:31:18 -0800 |
| commit | dc9a62b5ab71868c6e9d3ff5c25a773a1135e974 (patch) | |
| tree | c1f26801e3a1aa5cbbf7a918d5871bd0616442ac /indra/newview/llappviewer.cpp | |
| parent | 589472a4e91d61b70d1f4184fc1c8e7918fb5606 (diff) | |
| parent | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (diff) | |
Merge
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 1ccb691fb3..07b3399637 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" @@ -112,7 +111,6 @@ #include "apr_dso.h" #include <boost/lexical_cast.hpp> -#include "llnotify.h" #include "llviewerkeyboard.h" #include "lllfsthread.h" #include "llworkerthread.h" |