livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code comments/variable names to make clear when legacy names used 

Reviewed with Leyla
master
James Cook 2010-05-28 15:14:29 -07:00
parent b944a47927
commit 3e7f5e571e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterscriptlimits.cpp
View File

@ -730,8 +730,8 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content)
if(std::find(names_requested.begin(), names_requested.end(), owner_id) == names_requested.end())
{
names_requested.push_back(owner_id);
gCacheName->get(owner_id, is_group_owned,
boost::bind(&LLPanelScriptLimitsRegionMemory::onNameCache,
gCacheName->get(owner_id, is_group_owned, // username
boost::bind(&LLPanelScriptLimitsRegionMemory::onNameCache,
this, _1, _2));
}
}

14
indra/newview/llinspectremoteobject.cpp
View File

@ -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)