Merge pull request #2856 from secondlife/marchcat/c-develop

Develop → Maint C sync

1 files changed, 10 insertions, 9 deletions

diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index 401f52a579..609387b6de 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -70,12 +70,12 @@ public:
 
     // If available, copies name ("bobsmith123" or "James Linden") into string
     // If not available, copies the string "waiting".
-    // Returns TRUE iff available.
-    BOOL getFullName(const LLUUID& id, std::string& full_name);
+    // Returns true if available.
+    bool getFullName(const LLUUID& id, std::string& full_name);
 
     // Reverse lookup of UUID from name
-    BOOL getUUID(const std::string& first, const std::string& last, LLUUID& id);
-    BOOL getUUID(const std::string& fullname, LLUUID& id);
+    bool getUUID(const std::string& first, const std::string& last, LLUUID& id);
+    bool getUUID(const std::string& fullname, LLUUID& id);
 
     // IDEVO Temporary code
     // Clean up new-style "bobsmith123 Resident" names to "bobsmith123" for display
@@ -99,8 +99,8 @@ public:
     // If available, this method copies the group name into the string
     // provided. The caller must allocate at least
     // DB_GROUP_NAME_BUF_SIZE characters. If not available, this
-    // method copies the string "waiting". Returns TRUE iff available.
-    BOOL getGroupName(const LLUUID& id, std::string& group);
+    // method copies the string "waiting". Returns true if available.
+    bool getGroupName(const LLUUID& id, std::string& group);
 
     // Call the callback with the group or avatar name.
     // If the data is currently available, may call the callback immediatly
@@ -127,15 +127,16 @@ public:
     void dumpStats();   // Dumps the sizes of the cache and associated queues.
     void clear();       // Deletes all entries from the cache
 
-    static std::string getDefaultName();
+    std::string getDefaultName();
 
     // Returns "Resident", the default last name for SLID-based accounts
     // that have no last name.
     static std::string getDefaultLastName();
 
-    static void localizeCacheName(std::string key, std::string value);
-    static std::map<std::string, std::string> sCacheName;
+    void localizeCacheName(std::string key, std::string value);
+
 private:
+    std::map<std::string, std::string> mCacheName;
 
     class Impl;
     Impl& impl;