Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

indra/llcommon/aialert.h

@@ -45,8 +45,13 @@
 // Throw arbitrary class.
 #define   THROW_ALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(),                                                     AIAlert::not_modal, __VA_ARGS__)
 #define  THROW_MALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(),                                                         AIAlert::modal, __VA_ARGS__)
+#ifdef __GNUC__
 #define  THROW_FALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__PRETTY_FUNCTION__, AIAlert::pretty_function_prefix), AIAlert::not_modal, __VA_ARGS__)
 #define THROW_FMALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__PRETTY_FUNCTION__, AIAlert::pretty_function_prefix),     AIAlert::modal, __VA_ARGS__)
+#else
+#define  THROW_FALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__FUNCTION__, AIAlert::pretty_function_prefix), AIAlert::not_modal, __VA_ARGS__)
+#define THROW_FMALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__FUNCTION__, AIAlert::pretty_function_prefix),     AIAlert::modal, __VA_ARGS__)
+#endif
 
 // Shortcut to throw AIAlert::Error.
 #define   THROW_ALERT(...)   THROW_ALERT_CLASS(AIAlert::Error, __VA_ARGS__)

indra/llcommon/llinstancetracker.h

@@ -32,6 +32,7 @@
 #include <typeinfo>
 
 #include "string_table.h"
+#include "llerror.h"			// llassert_always
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>

indra/llxml/aixml.cpp

@@ -410,7 +410,7 @@ T AIXMLElementParser::read_integer(char const* type, std::string const& value) c
 {
   long long int result;
   sscanf(value.c_str(),"%lld", &result);
-  if (result < std::numeric_limits<T>::min() || result > std::numeric_limits<T>::max())
+  if (result < (std::numeric_limits<T>::min)() || result > (std::numeric_limits<T>::max)())
   {
 	THROW_MALERT("AIXMLElementParser_read_integer_Invalid_TYPE_VALUE_in_FILEDESC_FILENAME",
 		AIArgs("[TYPE]", type)("[VALUE]", value)("FILEDESC", mFileDesc)("[FILENAME]", mFilename));

indra/llxml/aixml.h

@@ -175,6 +175,7 @@ class AIXMLElementParser
   protected:
 	// Used by AIXMLParser, which initializes mNode directly.
 	AIXMLElementParser(std::string const& filename, std::string const& file_desc, U32 version) : mVersion(version), mFilename(filename), mFileDesc(file_desc) { }
+	virtual ~AIXMLElementParser() { }
 
 	// Used for error reporting.
 	virtual std::string node_name(void) const { return "node '" + mNode->getName() + "'"; }

indra/newview/aixmllindengenepool.cpp

@@ -46,7 +46,7 @@
 // The reason for this clumsy way to link wearable to extra meta data is to stay
 // compatible with the older format (no metaversion).
 
-#include "sys.h"
+#include "llviewerprecompiledheaders.h"
 #include "aixmllindengenepool.h"
 #include "hippogridmanager.h"
 #include "llvisualparam.h"