Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.

13 files changed, 14 insertions, 19 deletions

diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp
index 8f0912d98d..306b66a39d 100644
--- a/indra/test/llblowfish_tut.cpp
+++ b/indra/test/llblowfish_tut.cpp
@@ -16,8 +16,6 @@
 
 #include "llblowfishcipher.h"
 
-#include <string>
-#include <stdio.h>
 #include "lluuid.h"
 
 namespace tut
diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp
index 4ac72d59d3..f7737464da 100644
--- a/indra/test/llbuffer_tut.cpp
+++ b/indra/test/llbuffer_tut.cpp
@@ -9,6 +9,7 @@
  */
 
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 #include "llbuffer.h"
 #include "llerror.h"
diff --git a/indra/test/llhttpdate_tut.cpp b/indra/test/llhttpdate_tut.cpp
index 2a82155cd1..f491f08e78 100644
--- a/indra/test/llhttpdate_tut.cpp
+++ b/indra/test/llhttpdate_tut.cpp
@@ -13,9 +13,6 @@
 #include "lldate.h"
 #include "llframetimer.h"
 
-#include <string>
-#include <time.h>
-
 namespace tut
 {
     struct httpdate_data
diff --git a/indra/test/llhttpnode_tut.cpp b/indra/test/llhttpnode_tut.cpp
index 30165cb769..fb94eb3287 100644
--- a/indra/test/llhttpnode_tut.cpp
+++ b/indra/test/llhttpnode_tut.cpp
@@ -7,9 +7,8 @@
  * $License$
  */
 
-#include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
-
 #include "llhttpnode.h"
 #include "llsdhttpserver.h"
 
diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp
index e0001438c7..d5e1d32ffc 100644
--- a/indra/test/lliohttpserver_tut.cpp
+++ b/indra/test/lliohttpserver_tut.cpp
@@ -7,9 +7,8 @@
  * $License$
  */
 
-#include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
-
 #include "llbufferstream.h"
 #include "lliohttpserver.h"
 #include "llsdhttpserver.h"
diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp
index 30a799a1bf..6e07671c8d 100644
--- a/indra/test/llmessageconfig_tut.cpp
+++ b/indra/test/llmessageconfig_tut.cpp
@@ -7,9 +7,9 @@
  * $License$
  */
 
-#include <tut/tut.h>
-#include "lltut.h"
+#include "linden_common.h"
 #include "llmessageconfig.h"
+#include "lltut.h"
 #include "llsdserialize.h"
 #include "llfile.h"
 #include "lldir.h"
diff --git a/indra/test/llmessagetemplateparser_tut.cpp b/indra/test/llmessagetemplateparser_tut.cpp
index 1faa4e90cb..8bb23009ce 100644
--- a/indra/test/llmessagetemplateparser_tut.cpp
+++ b/indra/test/llmessagetemplateparser_tut.cpp
@@ -7,10 +7,9 @@
  * $License$
  */
 
-#include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
 #include "llmessagetemplateparser.h"
+#include "lltut.h"
 
 namespace tut
 {
diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp
index ef6e1cc94b..16920082c5 100644
--- a/indra/test/llsaleinfo_tut.cpp
+++ b/indra/test/llsaleinfo_tut.cpp
@@ -9,8 +9,8 @@
  */
 
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "llsaleinfo.h"
 
 namespace tut
diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp
index 0ceb4302ff..7a1ac9ab49 100644
--- a/indra/test/llsd_new_tut.cpp
+++ b/indra/test/llsd_new_tut.cpp
@@ -7,7 +7,6 @@
  * $License$
  */
 
-#include <math.h>
 #include <tut/tut.h>
 #include "linden_common.h"
 #include "lltut.h"
diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp
index 900de1f2dd..938293434e 100755
--- a/indra/test/llsdmessagebuilder_tut.cpp
+++ b/indra/test/llsdmessagebuilder_tut.cpp
@@ -8,8 +8,9 @@
  */
 
 #include <tut/tut.h>
-#include "lltut.h"
 
+#include "linden_common.h"
+#include "lltut.h"
 #include "llsdmessagebuilder.h"
 #include "llsdmessagereader.h"
 #include "llsdtraits.h"
diff --git a/indra/test/llservicebuilder_tut.cpp b/indra/test/llservicebuilder_tut.cpp
index e782cfbb6f..759281e8a6 100644
--- a/indra/test/llservicebuilder_tut.cpp
+++ b/indra/test/llservicebuilder_tut.cpp
@@ -8,8 +8,9 @@
 */
 
 #include <tut/tut.h>
-#include "lltut.h"
 
+#include "linden_common.h"
+#include "lltut.h"
 #include "llsd.h"
 #include "llservicebuilder.h"
 
diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp
index 17e5c7cc2c..b3d03375fa 100644
--- a/indra/test/llstreamtools_tut.cpp
+++ b/indra/test/llstreamtools_tut.cpp
@@ -9,7 +9,8 @@
  */
  
 #include <tut/tut.h>
-#include <fstream>
+
+#include "linden_common.h"
 #include "llstreamtools.h"
 #include "lltut.h"
 
diff --git a/indra/test/llxorcipher_tut.cpp b/indra/test/llxorcipher_tut.cpp
index 6fe5176cb0..3fd4e3ad97 100644
--- a/indra/test/llxorcipher_tut.cpp
+++ b/indra/test/llxorcipher_tut.cpp
@@ -8,7 +8,7 @@
  * $License$
  */
  
-#include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 #include "llxorcipher.h"
 #include "llnullcipher.h"