3 files changed, 257 insertions, 0 deletions

diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index 5d590a9..af9b247 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -18,6 +18,7 @@ set(llcommon_SOURCE_FILES
     llapp.cpp
     llapr.cpp
     llassettype.cpp
+    llavatarname.cpp
     llbase32.cpp
     llbase64.cpp
     llcommon.cpp
@@ -87,6 +88,7 @@ set(llcommon_HEADER_FILES
     llassettype.h
     llassoclist.h
     llavatarconstants.h
+    llavatarname.h
     llbase32.h
     llbase64.h
     llboost.h
diff --git a/linden/indra/llcommon/llavatarname.cpp b/linden/indra/llcommon/llavatarname.cpp
new file mode 100644
index 0000000..ebe8c88
--- /dev/null
+++ b/linden/indra/llcommon/llavatarname.cpp
@@ -0,0 +1,150 @@
+/** 
+ * @file llavatarname.cpp
+ * @brief Represents name-related data for an avatar, such as the
+ * username/SLID ("bobsmith123" or "james.linden") and the display
+ * name ("James Cook")
+ *
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+
+#include "llavatarname.h"
+
+#include "lldate.h"
+#include "llsd.h"
+
+bool LLAvatarName::sOmitResidentAsLastName = false;
+
+// Store these in pre-built std::strings to avoid memory allocations in
+// LLSD map lookups
+static const std::string USERNAME("username");
+static const std::string DISPLAY_NAME("display_name");
+static const std::string LEGACY_FIRST_NAME("legacy_first_name");
+static const std::string LEGACY_LAST_NAME("legacy_last_name");
+static const std::string IS_DISPLAY_NAME_DEFAULT("is_display_name_default");
+static const std::string DISPLAY_NAME_EXPIRES("display_name_expires");
+static const std::string DISPLAY_NAME_NEXT_UPDATE("display_name_next_update");
+
+LLAvatarName::LLAvatarName()
+:       mUsername(),
+        mDisplayName(),
+        mLegacyFirstName(),
+        mLegacyLastName(),
+        mIsDisplayNameDefault(false),
+        mIsDummy(false),
+        mExpires(F64_MAX),
+        mNextUpdate(0.0)
+{ }
+
+bool LLAvatarName::operator<(const LLAvatarName& rhs) const
+{
+        if (mUsername == rhs.mUsername)
+                return mDisplayName < rhs.mDisplayName;
+        else
+                return mUsername < rhs.mUsername;
+}
+
+LLSD LLAvatarName::asLLSD() const
+{
+        LLSD sd;
+        sd[USERNAME] = mUsername;
+        sd[DISPLAY_NAME] = mDisplayName;
+        sd[LEGACY_FIRST_NAME] = mLegacyFirstName;
+        sd[LEGACY_LAST_NAME] = mLegacyLastName;
+        sd[IS_DISPLAY_NAME_DEFAULT] = mIsDisplayNameDefault;
+        sd[DISPLAY_NAME_EXPIRES] = LLDate(mExpires);
+        sd[DISPLAY_NAME_NEXT_UPDATE] = LLDate(mNextUpdate);
+        return sd;
+}
+
+void LLAvatarName::fromLLSD(const LLSD& sd)
+{
+        mUsername = sd[USERNAME].asString();
+        mDisplayName = sd[DISPLAY_NAME].asString();
+        mLegacyFirstName = sd[LEGACY_FIRST_NAME].asString();
+        mLegacyLastName = sd[LEGACY_LAST_NAME].asString();
+        mIsDisplayNameDefault = sd[IS_DISPLAY_NAME_DEFAULT].asBoolean();
+        LLDate expires = sd[DISPLAY_NAME_EXPIRES];
+        mExpires = expires.secondsSinceEpoch();
+        LLDate next_update = sd[DISPLAY_NAME_NEXT_UPDATE];
+        mNextUpdate = next_update.secondsSinceEpoch();
+}
+
+std::string LLAvatarName::getCompleteName() const
+{
+        std::string name;
+        if (!mUsername.empty())
+        {
+                name = mDisplayName + " (" + mUsername + ")";
+        }
+        else
+        {
+                // ...display names are off, legacy name is in mDisplayName
+                name = mDisplayName;
+        }
+        return name;
+}
+
+std::string LLAvatarName::getLegacyName() const
+{
+        std::string name;
+        name.reserve(mLegacyFirstName.size() + 1 + mLegacyLastName.size());
+        name = mLegacyFirstName;
+        if (!sOmitResidentAsLastName || mLegacyLastName != "Resident")
+        {
+                name += " ";
+                name += mLegacyLastName;
+        }
+        return name;
+}
+
+std::string LLAvatarName::getNames(bool linefeed) const
+{
+        std::string name;
+
+        if (mUsername.empty())
+        {
+                // ...display names are off, legacy name is in mDisplayName
+                name = mDisplayName;
+                if (sOmitResidentAsLastName)
+                {
+                        LLStringUtil::replaceString(name, " Resident", "");
+                }
+        }
+        else
+        {
+                name = getLegacyName();
+                if (name != mDisplayName)
+                {
+                        if (linefeed)
+                        {
+                                name = mDisplayName + "\n[" + name + "]";
+                        }
+                        else
+                        {
+                                name = mDisplayName + " [" + name + "]";
+                        }
+                }
+        }
+
+        return name;
+}
diff --git a/linden/indra/llcommon/llavatarname.h b/linden/indra/llcommon/llavatarname.h
new file mode 100644
index 0000000..3b6c6ea
--- /dev/null
+++ b/linden/indra/llcommon/llavatarname.h
@@ -0,0 +1,105 @@
+/** 
+ * @file llavatarname.h
+ * @brief Represents name-related data for an avatar, such as the
+ * username/SLID ("bobsmith123" or "james.linden") and the display
+ * name ("James Cook")
+ *
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#ifndef LLAVATARNAME_H
+#define LLAVATARNAME_H
+
+#include <string>
+
+class LLSD;
+
+class LL_COMMON_API LLAvatarName
+{
+public:
+        LLAvatarName();
+        
+        bool operator<(const LLAvatarName& rhs) const;
+
+        LLSD asLLSD() const;
+
+        void fromLLSD(const LLSD& sd);
+
+        // For normal names, returns "James Linden (james.linden)"
+        // When display names are disabled returns just "James Linden"
+        std::string getCompleteName() const;
+
+        // For normal names, returns "Whatever Display Name (John Doe)" when
+        // display name and legacy name are different, or just "John Doe"
+        // when they are equal or when display names are disabled.
+        // When linefeed == true, the space between the display name and
+        // the opening parenthesis for the legacy name is replaced with a
+        // line feed.
+        std::string getNames(bool linefeed = false) const;
+
+        // Returns "James Linden" or "bobsmith123 Resident" for backwards
+        // compatibility with systems like voice and muting
+        std::string getLegacyName() const;
+
+        // "bobsmith123" or "james.linden", US-ASCII only
+        std::string mUsername;
+
+        // "Jose' Sanchez" or "James Linden", 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 "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 "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)"
+        bool mIsDisplayNameDefault;
+
+        // Under error conditions, we may insert "dummy" records with
+        // names equal to legacy name into caches as placeholders.
+        // These can be shown in UI, but are not serialized.
+        bool mIsDummy;
+
+        // Names can change, so need to keep track of when name was
+        // last checked.
+        // Unix time-from-epoch seconds for efficiency
+        F64 mExpires;
+        
+        // You can only change your name every N hours, so record
+        // when the next update is allowed
+        // Unix time-from-epoch seconds
+        F64 mNextUpdate;
+
+        // true to prevent the displaying of "Resident" as a last name
+        // in legacy names
+        static bool sOmitResidentAsLastName;
+};
+
+#endif