summaryrefslogtreecommitdiff
path: root/indra/newview/llworldmap.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-08-17 03:56:38 +0000
committerDon Kjer <don@lindenlab.com>2012-08-17 03:56:38 +0000
commit64d9705ae21c42f4c7869a414e250c5de251b143 (patch)
treea8bd5946907cb65be0550a3f4529331fa94b933a /indra/newview/llworldmap.h
parent7ac0d2b8a31174b3d8872ec8ed5ed64c3d0bc7ed (diff)
Expanding region flags to 64 bits. Adding region protocol flags
Diffstat (limited to 'indra/newview/llworldmap.h')
-rw-r--r--indra/newview/llworldmap.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
index 73530b9694..c17feaa04b 100644
--- a/indra/newview/llworldmap.h
+++ b/indra/newview/llworldmap.h
@@ -102,7 +102,7 @@ public:
// Setters
void setName(std::string& name) { mName = name; }
void setAccess (U32 accesscode) { mAccess = accesscode; }
- void setRegionFlags (U32 region_flags) { mRegionFlags = region_flags; }
+ void setRegionFlags (U64 region_flags) { mRegionFlags = region_flags; }
void setLandForSaleImage (LLUUID image_id);
// void setWaterHeight (F32 water_height) { mWaterHeight = water_height; }
@@ -152,7 +152,7 @@ private:
bool mFirstAgentRequest; // Init agent request flag
U32 mAccess; // Down/up and maturity rating of the region
- U32 mRegionFlags; // Tell us if the siminfo has been received (if non 0) and what kind of region it is (Sandbox, allow damage)
+ U64 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 +198,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, U32 region_flags);
+ static bool insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUID& uuid, U32 accesscode, U64 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)