summaryrefslogtreecommitdiff
path: root/indra/newview/llinspectremoteobject.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-28 15:14:29 -0700
committerJames Cook <james@lindenlab.com>2010-05-28 15:14:29 -0700
commit3e7f5e571ec223a67cb30ed8ce5cd09c130c3e72 (patch)
treea98808f7951c6e807a0e6b6e2211424921d17b26 /indra/newview/llinspectremoteobject.cpp
parentb944a4792762bf61b7837a29c8580c9823c9670b (diff)
Code comments/variable names to make clear when legacy names used
Reviewed with Leyla
Diffstat (limited to 'indra/newview/llinspectremoteobject.cpp')
-rw-r--r--indra/newview/llinspectremoteobject.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp
index 08446760f8..b651306d96 100644
--- a/indra/newview/llinspectremoteobject.cpp
+++ b/indra/newview/llinspectremoteobject.cpp
@@ -71,7 +71,7 @@ private:
private:
LLUUID mObjectID;
LLUUID mOwnerID;
- std::string mOwner;
+ std::string mOwnerLegacyName;
std::string mSLurl;
std::string mName;
bool mGroupOwned;
@@ -81,7 +81,7 @@ LLInspectRemoteObject::LLInspectRemoteObject(const LLSD& sd) :
LLInspect(LLSD()),
mObjectID(NULL),
mOwnerID(NULL),
- mOwner(""),
+ mOwnerLegacyName(),
mSLurl(""),
mName(""),
mGroupOwned(false)
@@ -118,10 +118,10 @@ void LLInspectRemoteObject::onOpen(const LLSD& data)
mSLurl = data["slurl"].asString();
// work out the owner's name
- mOwner = "";
+ mOwnerLegacyName = "";
if (gCacheName)
{
- gCacheName->get(mOwnerID, mGroupOwned,
+ gCacheName->get(mOwnerID, mGroupOwned, // muting
boost::bind(&LLInspectRemoteObject::onNameCache, this, _1, _2, _3));
}
@@ -142,7 +142,7 @@ void LLInspectRemoteObject::onClickMap()
void LLInspectRemoteObject::onClickBlock()
{
LLMute::EType mute_type = mGroupOwned ? LLMute::GROUP : LLMute::AGENT;
- LLMute mute(mOwnerID, mOwner, mute_type);
+ LLMute mute(mOwnerID, mOwnerLegacyName, mute_type);
LLMuteList::getInstance()->add(mute);
LLPanelBlockedList::showPanelAndSelect(mute.mID);
closeFloater();
@@ -155,7 +155,7 @@ void LLInspectRemoteObject::onClickClose()
void LLInspectRemoteObject::onNameCache(const LLUUID& id, const std::string& name, bool is_group)
{
- mOwner = name;
+ mOwnerLegacyName = name;
update();
}
@@ -166,7 +166,7 @@ void LLInspectRemoteObject::update()
getChild<LLUICtrl>("object_name")->setValue("<nolink>" + mName + "</nolink>");
// show the object's owner - click it to show profile
- std::string owner = mOwner;
+ std::string owner;
if (! mOwnerID.isNull())
{
if (mGroupOwned)