summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-12-11 19:17:37 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-12-11 19:17:37 +0200
commitedcdaf27ceaf00cf075416ba196a25a89357a9d1 (patch)
tree4aff9e3eb53689da75f6ef5e087ff54b6c3bcade /indra/newview/llappviewer.cpp
parente56dae206e4774e16003d1f404a6814fd81a04d3 (diff)
parent5f0b2624bc40c6c7580fa7c02f137c3dee330b94 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp2
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"