11 files changed, 34 insertions, 67 deletions

diff --git a/linden/indra/llcommon/indra_constants.cpp b/linden/indra/llcommon/indra_constants.cpp
index 64cbb11..1ab47d0 100644
--- a/linden/indra/llcommon/indra_constants.cpp
+++ b/linden/indra/llcommon/indra_constants.cpp
@@ -40,8 +40,5 @@
 const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb");
 
 // Governor Linden's agent id.
+// FIXME for meta-impy: Gotta get rid of this.
 const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f");
-const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
-const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
-// Maintenance's group id.
-const LLUUID MAINTENANCE_GROUP_ID("dc7b21cd-3c89-fcaa-31c8-25f9ffd224cd");
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index b765d4d..e64ee62 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -61,7 +61,8 @@ static const F32 REGION_WIDTH_METERS = 256.f;
 static const S32 REGION_WIDTH_UNITS = 256;
 static const U32 REGION_WIDTH_U32 = 256;
 
-const F32 REGION_HEIGHT_METERS = 4096.f;
+// TODO - this is not actually used anywhere, but updating it anyway.
+const F32 REGION_HEIGHT_METERS = 16383.f;
 
 // Bits for simulator performance query flags
 enum LAND_STAT_FLAGS
@@ -153,11 +154,6 @@ const	char	WATER_LAYER_CODE				= 'W';
 const   char    WIND_LAYER_CODE                                 = '7';
 const   char    CLOUD_LAYER_CODE                                = '8';
 
-// Extended land layer for Aurora Sim
-const   char    AURORA_LAND_LAYER_CODE                  = 'M';
-const   char    AURORA_WIND_LAYER_CODE                  = '9';
-const   char    AURORA_CLOUD_LAYER_CODE                 = ':';
-
 // keys
 // Bit masks for various keyboard modifier keys.
 const MASK MASK_NONE =                  0x0000;
@@ -271,13 +267,9 @@ const U8 GOD_NOT = 0;
 LL_COMMON_API extern const LLUUID LL_UUID_ALL_AGENTS;
 
 // inventory library owner
+// FIXME for meta-impy: Gotta get rid of this.
 LL_COMMON_API extern const LLUUID ALEXANDRIA_LINDEN_ID;
 
-LL_COMMON_API extern const LLUUID GOVERNOR_LINDEN_ID;
-LL_COMMON_API extern const LLUUID REALESTATE_LINDEN_ID;
-// Maintenance's group id.
-LL_COMMON_API extern const LLUUID MAINTENANCE_GROUP_ID;
-
 // Flags for kick message
 const U32 KICK_FLAGS_DEFAULT    = 0x0;
 const U32 KICK_FLAGS_FREEZE             = 1 << 0;
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index bf844b9..cfb2dce 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -82,7 +82,7 @@
 // moved msvc warnings to llpreprocessor.h  *TODO - delete this comment after merge conflicts are unlikely -brad
 #endif  //      LL_WINDOWS
 
-// Linden only libs in alpha-order other than stdtypes.h
+// Viewer only libs in alpha-order other than stdtypes.h
 // *NOTE: Please keep includes here to a minimum, see above.
 #include "stdtypes.h"
 #include "lldefs.h"
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index 9f611ae..5465cc3 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -50,12 +50,12 @@ public:
                 AT_SOUND = 1, 
 
                 // Links instant message access to the user on the card. eg, a
-                // card for yourself, a card for linden support, a card for
+                // card for yourself, a card for grid support, a card for
                 // the guy you were talking to in the coliseum.
                 AT_CALLINGCARD = 2,
 
                 // Links to places in the world with location and a screen
-                // shot or image saved. eg, home, linden headquarters, the
+                // shot or image saved. eg, home, grid headquarters, the
                 // coliseum, or destinations where we want to increase
                 // traffic.
                 AT_LANDMARK = 3,
diff --git a/linden/indra/llcommon/llavatarname.cpp b/linden/indra/llcommon/llavatarname.cpp
index ebe8c88..4a2c7ab 100644
--- a/linden/indra/llcommon/llavatarname.cpp
+++ b/linden/indra/llcommon/llavatarname.cpp
@@ -1,7 +1,7 @@
 /** 
  * @file llavatarname.cpp
  * @brief Represents name-related data for an avatar, such as the
- * username/SLID ("bobsmith123" or "james.linden") and the display
+ * username/SLID ("bobsmith123" or "james.green") and the display
  * name ("James Cook")
  *
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
diff --git a/linden/indra/llcommon/llavatarname.h b/linden/indra/llcommon/llavatarname.h
index 3b6c6ea..1e141dc 100644
--- a/linden/indra/llcommon/llavatarname.h
+++ b/linden/indra/llcommon/llavatarname.h
@@ -1,7 +1,7 @@
 /** 
  * @file llavatarname.h
  * @brief Represents name-related data for an avatar, such as the
- * username/SLID ("bobsmith123" or "james.linden") and the display
+ * username/SLID ("bobsmith123" or "james.green") and the display
  * name ("James Cook")
  *
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
@@ -43,8 +43,8 @@ public:
 
         void fromLLSD(const LLSD& sd);
 
-        // For normal names, returns "James Linden (james.linden)"
-        // When display names are disabled returns just "James Linden"
+        // For normal names, returns "James Green (james.green)"
+        // When display names are disabled returns just "James Green"
         std::string getCompleteName() const;
 
         // For normal names, returns "Whatever Display Name (John Doe)" when
@@ -55,31 +55,31 @@ public:
         // line feed.
         std::string getNames(bool linefeed = false) const;
 
-        // Returns "James Linden" or "bobsmith123 Resident" for backwards
+        // Returns "James Green" or "bobsmith123 Resident" for backwards
         // compatibility with systems like voice and muting
         std::string getLegacyName() const;
 
-        // "bobsmith123" or "james.linden", US-ASCII only
+        // "bobsmith123" or "james.green", US-ASCII only
         std::string mUsername;
 
-        // "Jose' Sanchez" or "James Linden", UTF-8 encoded Unicode
+        // "Jose' Sanchez" or "James Green", UTF-8 encoded Unicode
         // Contains data whether or not user has explicitly set
         // a display name; may duplicate their username.
         std::string mDisplayName;
 
-        // For "James Linden", "James"
+        // For "James Green", "James"
         // For "bobsmith123", "bobsmith123"
         // Used to communicate with legacy systems like voice and muting which
         // rely on old-style names.
         std::string mLegacyFirstName;
 
-        // For "James Linden", "Linden"
+        // For "James Green", "Green"
         // For "bobsmith123", "Resident"
         // see above for rationale
         std::string mLegacyLastName;
 
         // If true, both display name and SLID were generated from
-        // a legacy first and last name, like "James Linden (james.linden)"
+        // a legacy first and last name, like "James Green (james.green)"
         bool mIsDisplayNameDefault;
 
         // Under error conditions, we may insert "dummy" records with
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 6886e3a..29d90ba 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -1,6 +1,6 @@
 /** 
  * @file llpreprocessor.h
- * @brief This file should be included in all Linden Lab files and
+ * @brief This file should be included in all viewer files and
  * should only contain special preprocessor directives
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index cd5a9f2..069365b 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -596,38 +596,16 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
         return out;
 }
 
-bool is_hex_string(U8* str, S32 len)
+bool LLStringOps::isHexString(const std::string& str)
 {
-        bool rv = true;
-        U8* c = str;
-        while(rv && len--)
+        const char* buf = str.c_str();
+        int len = str.size();
+        while (--len >= 0)
         {
-                switch(*c)
-                {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                case 'a':
-                case 'b':
-                case 'c':
-                case 'd':
-                case 'e':
-                case 'f':
-                        ++c;
-                        break;
-                default:
-                        rv = false;
-                        break;
-                }
+                if (!isxdigit(buf[len])) return false;
         }
-        return rv;
+
+        return true;
 }
 
 #if LL_WINDOWS
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index a592e2c..1717479 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -175,6 +175,8 @@ public:
 
         static S32      collate(const char* a, const char* b) { return strcoll(a, b); }
         static S32      collate(const llwchar* a, const llwchar* b);
+
+        static bool isHexString(const std::string& str);
 };
 
 /**
@@ -456,8 +458,6 @@ LL_COMMON_API std::string mbcsstring_makeASCII(const std::string& str);
 
 LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str);
 
-LL_COMMON_API bool is_hex_string(U8* str, S32 len);
-
 
 #if LL_WINDOWS
 /* @name Windows string helpers
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index ab74a3f..a571b95 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -40,15 +40,15 @@ const S32 LL_VERSION_MINOR = 23;
 const S32 LL_VERSION_PATCH = 5;
 const S32 LL_VERSION_BUILD = 136262;
 
-const char * const LL_VIEWER_NAME = "Second Life";
+const char * const LL_VIEWER_NAME = "meta-impy";
 
 // These aren't used anymore. 
 // The channel is ViewerChannelName in settings.xml
-// The Imprudence version is set in app_settings\viewerversion.xml -- MC
+// The meta-impy version is set in app_settings\viewerversion.xml -- MC
 
-/*const char * const LL_CHANNEL = "Imprudence";
+/*const char * const LL_CHANNEL = "meta-impy";
 
-const char * const IMP_VIEWER_NAME = "Imprudence";
+const char * const IMP_VIEWER_NAME = "meta-impy";
 
 const S32 IMP_VERSION_MAJOR = 1;
 const S32 IMP_VERSION_MINOR = 3;
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h
index 854a153..7c5ebdc 100644
--- a/linden/indra/llcommon/roles_constants.h
+++ b/linden/indra/llcommon/roles_constants.h
@@ -34,7 +34,7 @@
 #define LL_ROLES_CONSTANTS_H
 
 // This value includes the everyone group.
-const S32 MAX_ROLES = 10;
+const S32 MAX_ROLES = 25;
 
 enum LLRoleMemberChangeType
 {
@@ -89,7 +89,7 @@ const U64 GP_GROUP_CHANGE_IDENTITY = 0x1 << 11;	// Charter, insignia, 'Show In G
 
 // Parcel Management
 const U64 GP_LAND_DEED                  = 0x1 << 12;    // Deed Land and Buy Land for Group
-const U64 GP_LAND_RELEASE                       = 0x1 << 13;    // Release Land (to Gov. Linden)
+const U64 GP_LAND_RELEASE                       = 0x1 << 13;    // Release Land (abandon it back to the grid owners)
 const U64 GP_LAND_SET_SALE_INFO = 0x1 << 14;    // Set for sale info (Toggle "For Sale", Set Price, Set Target, Toggle "Sell objects with the land")
 const U64 GP_LAND_DIVIDE_JOIN           = 0x1 << 15;    // Divide and Join Parcels
 
@@ -126,7 +126,7 @@ const U64 GP_LAND_RETURN		= GP_LAND_RETURN_GROUP_OWNED
                                                                 | GP_LAND_RETURN_GROUP_SET      
                                                                 | GP_LAND_RETURN_NON_GROUP;
 
-const U64 GP_LAND_GARDENING             = 0x1LL << 35;  // Parcel Gardening - plant and move linden trees
+const U64 GP_LAND_GARDENING             = 0x1LL << 35;  // Parcel Gardening - plant and move tree prims
 
 // Object Management
 const U64 GP_OBJECT_DEED                        = 0x1LL << 36;  // Deed Object