Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
index c17feaa04b..d514b2f14c 100644
--- a/indra/newview/llworldmap.h
+++ b/indra/newview/llworldmap.h
@@ -36,6 +36,7 @@
 #include "llsingleton.h"
 #include "llviewerregion.h"
 #include "llviewertexture.h"
+#include "llgltexture.h"
 
 // Description of objects like hubs, events, land for sale, people and more (TBD).
 // Note: we don't store a "type" in there so we need to store instances of this class in 
@@ -102,7 +103,7 @@ public:
 	// Setters
 	void setName(std::string& name) { mName = name; }
 	void setAccess (U32 accesscode) { mAccess = accesscode; }
-	void setRegionFlags (U64 region_flags) { mRegionFlags = region_flags; }
+	void setRegionFlags (U32 region_flags) { mRegionFlags = region_flags; }
 	void setLandForSaleImage (LLUUID image_id);
 //	void setWaterHeight (F32 water_height) { mWaterHeight = water_height; }
 
@@ -152,7 +153,7 @@ private:
 	bool mFirstAgentRequest;	// Init agent request flag
 
 	U32  mAccess;				// Down/up and maturity rating of the region
-	U64 mRegionFlags;			// Tell us if the siminfo has been received (if non 0) and what kind of region it is (Sandbox, allow damage)
+	U32 mRegionFlags;			// Tell us if the siminfo has been received (if non 0) and what kind of region it is (Sandbox, allow damage)
 	// Currently not used but might prove useful one day so we comment out 
 //	F32 mWaterHeight;			// Water height on the region (not actively used)
 
@@ -198,7 +199,7 @@ public:
 
 	// Insert a region and items in the map global instance
 	// Note: x_world and y_world in world coordinates (meters)
-	static bool insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 accesscode, U64 region_flags);
+	static bool insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 accesscode, U32 region_flags);
 	static bool insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 type, S32 extra, S32 extra2);
 
 	// Get info on sims (region) : note that those methods only search the range of loaded sims (the one that are being browsed)