Fixed to allow param blocks to exceed 64k, even though the size makes me wince.

Modified viewer window to not create a navigation bar on exit if one doesn't yet exist.

Reviewed by Richard.

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index a853999e94..35c889b69f 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -34,6 +34,8 @@
 #include <boost/unordered_map.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include "llerror.h"
+
 namespace LLInitParam
 {
 	template<typename T> const T& defaultValue() { static T value; return value; }
@@ -302,8 +304,9 @@ namespace LLInitParam
 	private:
 		friend class BaseBlock;
 
-		U16			mEnclosingBlockOffset;
-		bool		mIsProvided;
+		U32		mEnclosingBlockOffset:31;
+		U32		mIsProvided:1;
+
 	};
 
 	// various callbacks and constraints associated with an individual param