Skip to content
Snippets Groups Projects
Commit fed0e337 authored by Richard Linden's avatar Richard Linden
Browse files

merge

parents 0bd41cbf 8999fe99
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llviewermessage.cpp
+ 5
− 0
View file @ fed0e337
......@@ -116,6 +116,11 @@
#include "llnotificationmanager.h" //
#if LL_MSVC
// disable boost::lexical_cast warning
#pragma warning (disable:4702)
#endif
//
// Constants
//
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment