summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-05-27 15:40:16 -0700
committerbrad kittenbrink <brad@lindenlab.com>2010-05-27 15:40:16 -0700
commitd9052212b5c575e31ddfe358c228e0ba9a7403ed (patch)
tree1670d0c29894ff18f8a48dcfab99877bddd11eaf /indra/newview/llviewermessage.cpp
parent0c7fafb70425853df26c703969e7a1892de2374e (diff)
parent4e8d423cc5fae86c8273df5e7ea583a9e0475711 (diff)
Merge of latest dessie/viewer-public with brad/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