summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-18 16:00:45 -0700
committerJames Cook <james@lindenlab.com>2010-05-18 16:00:45 -0700
commitf4148502e484d516b42c4a88603eee6889d45697 (patch)
treea7d049b1fb1ebb037c0d9c90202a6b2ffe9e86c1 /indra/llui
parent8238a377bd0e28303506446f2c7806b9632f3897 (diff)
Rename mSLID to mUsername to match the name of the field in the UI
Product made a late-breaking request to change the name of this field. The wire protocol for People API has not yet changed.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llurlentry.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index d3c866a854..aeb02aef1c 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -353,9 +353,9 @@ void LLUrlEntryAgent::onAvatarNameCache(const LLUUID& id,
const LLAvatarName& av_name)
{
std::string label = av_name.mDisplayName;
- if (!av_name.mSLID.empty())
+ if (!av_name.mUsername.empty())
{
- label += " (" + av_name.mSLID + ")";
+ label += " (" + av_name.mUsername + ")";
}
// received the agent name from the server - tell our observers
callObservers(id.asString(), label, mIcon);
@@ -418,9 +418,9 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
if (LLAvatarNameCache::get(agent_id, &av_name))
{
std::string label = av_name.mDisplayName;
- if (!av_name.mSLID.empty())
+ if (!av_name.mUsername.empty())
{
- label += " (" + av_name.mSLID + ")";
+ label += " (" + av_name.mUsername + ")";
}
// handle suffixes like /mute or /offerteleport
label = localize_slapp_label(url, label);