summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 15:41:51 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 15:41:51 -0500
commit08495d3f63e1e926e44185be07269ed40363024a (patch)
tree8e32278f96a14b36a4215e7fac16f68d072da961 /indra/newview/llappviewer.cpp
parent870d4449f5eec1c2a7e5e4627a0433846ab256aa (diff)
parent06f8017674295191d3c4400eacb36e34a167ffa5 (diff)
Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/
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 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"