diff options
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 12 | 
1 files changed, 3 insertions, 9 deletions
| diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 03c28eb2a5..d9cb83c089 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -220,7 +220,7 @@ public:  			av_name.mUsername = DUMMY_NAME;  			av_name.mDisplayName = DUMMY_NAME;  			av_name.mIsDisplayNameDefault = false; -			av_name.mIsDummy = true; +			av_name.mIsTemporaryName = true;  			av_name.mExpires = expires;  			it = unresolved_agents.beginArray(); @@ -449,7 +449,7 @@ void LLAvatarNameCache::exportFile(std::ostream& ostr)  	{  		const LLUUID& agent_id = it->first;  		const LLAvatarName& av_name = it->second; -		if (!av_name.mIsDummy) +		if (!av_name.mIsTemporaryName)  		{  			// key must be a string  			agents[agent_id.asString()] = av_name.asLLSD(); @@ -490,12 +490,6 @@ void LLAvatarNameCache::idle()  	// this way first synchronous get call on an expired entry won't return  	// legacy name.  LF -	//const F32 ERASE_EXPIRED_TIMEOUT = 60.f; // seconds -	//if (sEraseExpiredTimer.checkExpirationAndReset(ERASE_EXPIRED_TIMEOUT)) -	//{ -	//	eraseExpired(); -	//} -  	if (sAskQueue.empty())  	{  		return; @@ -550,7 +544,7 @@ void LLAvatarNameCache::buildLegacyName(const std::string& full_name,  	av_name->mUsername = "";  	av_name->mDisplayName = full_name;  	av_name->mIsDisplayNameDefault = true; -	av_name->mIsDummy = true; +	av_name->mIsTemporaryName = true;  	av_name->mExpires = F64_MAX;  } | 
