summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-06-07 12:14:13 +0100
committerLynx Linden <lynx@lindenlab.com>2010-06-07 12:14:13 +0100
commit185cd5d261a4bc6e02f49f40c72d76da4320a881 (patch)
treec08ae4afb5e79f6b90bfe085a32b4d3e6e16a070 /indra/newview/llviewermessage.cpp
parenteec00a712fff079009ae793d86e27b7f3ab13053 (diff)
parentedd224dc7b08ad72c0f36c5b0f24912fdf66ab1c (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5836aff4e7..41aa80f40d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -109,10 +109,6 @@
#include <boost/algorithm/string/split.hpp> //
#include <boost/regex.hpp>
-#if LL_WINDOWS // For Windows specific error handler
-#include "llwindebug.h" // For the invalid message handler
-#endif
-
#include "llnotificationmanager.h" //
#if LL_MSVC