Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/test/llhttpdate_tut.cpp b/indra/test/llhttpdate_tut.cpp
index 46684bb9dc..ecf734ee90 100755
--- a/indra/test/llhttpdate_tut.cpp
+++ b/indra/test/llhttpdate_tut.cpp
@@ -29,6 +29,7 @@
 #include "lltut.h"
 
 #include "lldate.h"
+#include "llcommon.h"
 #include "llframetimer.h"
 
 #include <time.h>
@@ -38,6 +39,12 @@ namespace tut
 {
     struct httpdate_data
     {
+		httpdate_data() 
+		{ 
+		}
+		~httpdate_data() 
+		{ 
+		}
         LLDate some_date;
     };
     typedef test_group<httpdate_data> httpdate_test;