From b9acd64221d44d42574ae089f6c174ca515eb8e9 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 29 Dec 2014 16:42:38 -0500
Subject: [PATCH] Better the cmdline_partial_name2key function

Just style fixes and opts.
---
 indra/newview/chatbar_as_cmdline.cpp | 33 +++++++++-------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp
index c1f6253ed..3eda4098f 100644
--- a/indra/newview/chatbar_as_cmdline.cpp
+++ b/indra/newview/chatbar_as_cmdline.cpp
@@ -523,37 +523,24 @@ LLUUID cmdline_partial_name2key(std::string partial_name)
 	std::string av_name;
 	LLStringUtil::toLower(partial_name);
 	LLWorld::getInstance()->getAvatars(&avatars);
-	typedef std::vector<LLUUID>::const_iterator av_iter;
 	bool has_avatarlist = LLFloaterAvatarList::instanceExists();
-	if(has_avatarlist)
+	if (has_avatarlist)
 		LLFloaterAvatarList::getInstance()->updateAvatarList();
-	for(av_iter i = avatars.begin(); i != avatars.end(); ++i)
+	for(std::vector<LLUUID>::const_iterator i = avatars.begin(); i != avatars.end(); ++i)
 	{
-		if(has_avatarlist)
-		{
-			LLAvatarListEntry* entry = LLFloaterAvatarList::getInstance()->getAvatarEntry(*i);
-			if(entry)
-			{
-				av_name = entry->getName();
-			}
-		}
-		if (av_name.empty() && !gCacheName->getFullName(*i, av_name))
-		{
-			LLVOAvatar *avatarp = gObjectList.findAvatar(*i);
-			if(avatarp)
-			{
-				av_name = avatarp->getFullname();
-			}
-		}
+		if (LLAvatarListEntry* entry = has_avatarlist ? LLFloaterAvatarList::instance().getAvatarEntry(*i) : NULL)
+			av_name = entry->getName();
+		else if (gCacheName->getFullName(*i, av_name));
+		else if (LLVOAvatar* avatarp = gObjectList.findAvatar(*i))
+			av_name = avatarp->getFullname();
+		else
+			continue;
 		LLStringUtil::toLower(av_name);
-		if(strstr(av_name.c_str(), partial_name.c_str()))
-		{
+		if (av_name.find(partial_name) != std::string::npos)
 			return *i;
-		}
 	}
 	return LLUUID::null;
 }
-					
 
 
 void cmdline_tp2name(std::string target)