diff options
| author | James Cook <james@lindenlab.com> | 2010-05-21 17:11:31 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-21 17:11:31 -0700 |
| commit | d674d11f895b8f3d578cded931cdc1c430379c95 (patch) | |
| tree | 91ed1a14337d6abf26291de16aa9d28304a33beb /indra/llcommon | |
| parent | 8992232e64155588c64b4ab29bad6766bc6c7ff6 (diff) | |
Rename LLAvatarName::getNameAndSLID() to getCompleteName()
Discussed with Leyla/Richard
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llavatarname.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llavatarname.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp index 5a20aff4e6..13b6ad705b 100644 --- a/indra/llcommon/llavatarname.cpp +++ b/indra/llcommon/llavatarname.cpp @@ -99,7 +99,7 @@ void LLAvatarName::fromLLSD(const LLSD& sd) mExpires = expires.secondsSinceEpoch(); } -std::string LLAvatarName::getNameAndSLID() const +std::string LLAvatarName::getCompleteName() const { std::string name; if (!mUsername.empty()) diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h index fb5cb277a2..8b74e006c3 100644 --- a/indra/llcommon/llavatarname.h +++ b/indra/llcommon/llavatarname.h @@ -51,7 +51,7 @@ public: // For normal names, returns "James Linden (james.linden)" // When display names are disabled returns just "James Linden" - std::string getNameAndSLID() const; + std::string getCompleteName() const; // Returns "James Linden" or "bobsmith123 Resident" for backwards // compatibility with systems like voice and muting |