From dd9bfb6d859c5848b5ff6c8fdebbc34ab65f92e7 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 22 Jan 2010 16:52:53 -0800
Subject: LLCacheName and LLUrlEntryAgent now understand SLIDs - accounts with
 "Resident" as last name should not display that name. Also added test display
 names.

---
 indra/llui/llurlentry.cpp            | 65 +++++++++++++++++++++++++++++++++---
 indra/llui/tests/llurlentry_stub.cpp |  7 ++++
 2 files changed, 68 insertions(+), 4 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 4927e57a52..326f1cec29 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -310,13 +310,70 @@ LLUrlEntryAgent::LLUrlEntryAgent()
 	mColor = LLUIColorTable::instance().getColor("AgentLinkColor");
 }
 
+// IDEVO demo code
+static std::string clean_name(const std::string& first, const std::string& last)
+{
+	std::string displayname;
+	if (first == "miyazaki23") // IDEVO demo code
+	{
+		// miyazaki
+		displayname += (char)(0xE5);
+		displayname += (char)(0xAE);
+		displayname += (char)(0xAE);
+		displayname += (char)(0xE5);
+		displayname += (char)(0xB4);
+		displayname += (char)(0x8E);
+		// hayao
+		displayname += (char)(0xE9);
+		displayname += (char)(0xA7);
+		displayname += (char)(0xBF);
+		// san
+		displayname += (char)(0xE3);
+		displayname += (char)(0x81);
+		displayname += (char)(0x95);
+		displayname += (char)(0xE3);
+		displayname += (char)(0x82);
+		displayname += (char)(0x93);
+	}
+	else if (first == "Jim")
+	{
+		displayname = "Jos";
+		displayname += (char)(0xC3);
+		displayname += (char)(0xA9);
+		displayname += " Sanchez";
+	}
+	else if (first == "James")
+	{
+		displayname = "James Cook";
+	}
+
+	std::string fullname = first;
+	if (!last.empty())
+	{
+		fullname += ' ';
+		fullname += last;
+	}
+
+	std::string final;
+	if (!displayname.empty())
+	{
+		final = displayname + " (" + fullname + ")";
+	}
+	else
+	{
+		final = fullname;
+	}
+	return final;
+}
+
 void LLUrlEntryAgent::onAgentNameReceived(const LLUUID& id,
 										  const std::string& first,
 										  const std::string& last,
 										  BOOL is_group)
 {
+	std::string final = clean_name(first, last);
 	// received the agent name from the server - tell our observers
-	callObservers(id.asString(), first + " " + last);
+	callObservers(id.asString(), final);
 }
 
 std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
@@ -335,14 +392,14 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	}
 
 	LLUUID agent_id(agent_id_string);
-	std::string full_name;
+	std::string first, last;
 	if (agent_id.isNull())
 	{
 		return LLTrans::getString("AvatarNameNobody");
 	}
-	else if (gCacheName->getFullName(agent_id, full_name))
+	else if (gCacheName->getName(agent_id, first, last))
 	{
-		return full_name;
+		return clean_name(first, last);
 	}
 	else
 	{
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 26d1f2e067..3731800adf 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -36,6 +36,13 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
 	return TRUE;
 }
 
+BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& last)
+{
+	first = "Lynx";
+	last = "Linden";
+	return TRUE;
+}
+
 BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 {
 	group = "My Group";
-- 
cgit v1.2.3


From 40907986d4044e2be75f862fac1153f9a14f13ad Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 22 Jan 2010 18:29:29 -0800
Subject: Pull llurlentryagent into newview so I can compile/link faster

---
 indra/llui/llurlentry.cpp            | 114 +----------------------------------
 indra/llui/llurlentry.h              |  14 +----
 indra/llui/llurlregistry.cpp         |  11 +++-
 indra/llui/llurlregistry.h           |   4 +-
 indra/llui/tests/llurlentry_test.cpp |  35 +++++------
 5 files changed, 31 insertions(+), 147 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 326f1cec29..d04cb8c7ff 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -297,119 +297,7 @@ std::string LLUrlEntrySLURL::getLocation(const std::string &url) const
 	return url.substr(pos, url.size() - pos);
 }
 
-//
-// LLUrlEntryAgent Describes a Second Life agent Url, e.g.,
-// secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-//
-LLUrlEntryAgent::LLUrlEntryAgent()
-{
-	mPattern = boost::regex("secondlife:///app/agent/[\\da-f-]+/\\w+",
-							boost::regex::perl|boost::regex::icase);
-	mMenuName = "menu_url_agent.xml";
-	mIcon = "Generic_Person";
-	mColor = LLUIColorTable::instance().getColor("AgentLinkColor");
-}
-
-// IDEVO demo code
-static std::string clean_name(const std::string& first, const std::string& last)
-{
-	std::string displayname;
-	if (first == "miyazaki23") // IDEVO demo code
-	{
-		// miyazaki
-		displayname += (char)(0xE5);
-		displayname += (char)(0xAE);
-		displayname += (char)(0xAE);
-		displayname += (char)(0xE5);
-		displayname += (char)(0xB4);
-		displayname += (char)(0x8E);
-		// hayao
-		displayname += (char)(0xE9);
-		displayname += (char)(0xA7);
-		displayname += (char)(0xBF);
-		// san
-		displayname += (char)(0xE3);
-		displayname += (char)(0x81);
-		displayname += (char)(0x95);
-		displayname += (char)(0xE3);
-		displayname += (char)(0x82);
-		displayname += (char)(0x93);
-	}
-	else if (first == "Jim")
-	{
-		displayname = "Jos";
-		displayname += (char)(0xC3);
-		displayname += (char)(0xA9);
-		displayname += " Sanchez";
-	}
-	else if (first == "James")
-	{
-		displayname = "James Cook";
-	}
-
-	std::string fullname = first;
-	if (!last.empty())
-	{
-		fullname += ' ';
-		fullname += last;
-	}
-
-	std::string final;
-	if (!displayname.empty())
-	{
-		final = displayname + " (" + fullname + ")";
-	}
-	else
-	{
-		final = fullname;
-	}
-	return final;
-}
-
-void LLUrlEntryAgent::onAgentNameReceived(const LLUUID& id,
-										  const std::string& first,
-										  const std::string& last,
-										  BOOL is_group)
-{
-	std::string final = clean_name(first, last);
-	// received the agent name from the server - tell our observers
-	callObservers(id.asString(), final);
-}
-
-std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
-{
-	if (!gCacheName)
-	{
-		// probably at the login screen, use short string for layout
-		return LLTrans::getString("LoadingData");
-	}
-
-	std::string agent_id_string = getIDStringFromUrl(url);
-	if (agent_id_string.empty())
-	{
-		// something went wrong, just give raw url
-		return unescapeUrl(url);
-	}
-
-	LLUUID agent_id(agent_id_string);
-	std::string first, last;
-	if (agent_id.isNull())
-	{
-		return LLTrans::getString("AvatarNameNobody");
-	}
-	else if (gCacheName->getName(agent_id, first, last))
-	{
-		return clean_name(first, last);
-	}
-	else
-	{
-		gCacheName->get(agent_id, FALSE,
-			boost::bind(&LLUrlEntryAgent::onAgentNameReceived,
-				this, _1, _2, _3, _4));
-		addObserver(agent_id_string, url, cb);
-		return LLTrans::getString("LoadingData");
-	}
-}
+// LLUrlEntryAgent temporarily moved to newview IDEVO
 
 //
 // LLUrlEntryGroup Describes a Second Life group Url, e.g.,
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 4adffde99c..33ec9d82a9 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -156,19 +156,7 @@ public:
 	/*virtual*/ std::string getLocation(const std::string &url) const;
 };
 
-///
-/// LLUrlEntryAgent Describes a Second Life agent Url, e.g.,
-/// secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-///
-class LLUrlEntryAgent : public LLUrlEntryBase
-{
-public:
-	LLUrlEntryAgent();
-	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
-private:
-	void onAgentNameReceived(const LLUUID& id, const std::string& first,
-							 const std::string& last, BOOL is_group);
-};
+/// IDEVO LLUrlEntryAgent temporarily moved to newview
 
 ///
 /// LLUrlEntryGroup Describes a Second Life group Url, e.g.,
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index ad5c0911f8..4fbdae9d38 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -43,11 +43,13 @@ void LLUrlRegistryNullCallback(const std::string &url, const std::string &label)
 
 LLUrlRegistry::LLUrlRegistry()
 {
+	mUrlEntry.reserve(16);
+
 	// Urls are matched in the order that they were registered
 	registerUrl(new LLUrlEntrySLURL());
 	registerUrl(new LLUrlEntryHTTP());
 	registerUrl(new LLUrlEntryHTTPLabel());
-	registerUrl(new LLUrlEntryAgent());
+	// IDEVO registerUrl(new LLUrlEntryAgent());
 	registerUrl(new LLUrlEntryGroup());
 	registerUrl(new LLUrlEntryParcel());
 	registerUrl(new LLUrlEntryTeleport());
@@ -73,11 +75,14 @@ LLUrlRegistry::~LLUrlRegistry()
 	}
 }
 
-void LLUrlRegistry::registerUrl(LLUrlEntryBase *url)
+void LLUrlRegistry::registerUrl(LLUrlEntryBase *url, bool force_front)
 {
 	if (url)
 	{
-		mUrlEntry.push_back(url);
+		if (force_front)  // IDEVO
+			mUrlEntry.insert(mUrlEntry.begin(), url);
+		else
+			mUrlEntry.push_back(url);
 	}
 }
 
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h
index 399ee0a988..6d47c2c2a2 100644
--- a/indra/llui/llurlregistry.h
+++ b/indra/llui/llurlregistry.h
@@ -70,7 +70,9 @@ public:
 	~LLUrlRegistry();
 
 	/// add a new Url handler to the registry (will be freed on destruction)
-	void registerUrl(LLUrlEntryBase *url);
+	/// optionally force it to the front of the list, making it take
+	/// priority over other regular expression matches for URLs
+	void registerUrl(LLUrlEntryBase *url, bool force_front = false);
 
 	/// get the next Url in an input string, starting at a given character offset
 	/// your callback is invoked if the matched Url's label changes in the future
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 80be8fcbf7..9200708784 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -266,28 +266,29 @@ namespace tut
 		//
 		// test LLUrlEntryAgent - secondlife://app/agent Urls
 		//
-		LLUrlEntryAgent url;
-		boost::regex r = url.getPattern();
+		// IDEVO - moved temporarily into newview, not available for test
+		//LLUrlEntryAgent url;
+		//boost::regex r = url.getPattern();
 
-		testRegex("Invalid Agent Url", r,
-				  "secondlife:///app/agent/0e346d8b-4433-4d66-XXXX-fd37083abc4c/about",
-				  "");
+		//testRegex("Invalid Agent Url", r,
+		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-XXXX-fd37083abc4c/about",
+		//		  "");
 
-		testRegex("Agent Url ", r,
-				  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about",
-				  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
+		//testRegex("Agent Url ", r,
+		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about",
+		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
 
-		testRegex("Agent Url in text", r,
-				  "XXX secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about XXX",
-				  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
+		//testRegex("Agent Url in text", r,
+		//		  "XXX secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about XXX",
+		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
 
-		testRegex("Agent Url multicase", r,
-				  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About XXX",
-				  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About");
+		//testRegex("Agent Url multicase", r,
+		//		  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About XXX",
+		//		  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About");
 
-		testRegex("Agent Url alternate command", r,
-				  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar",
-				  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar");
+		//testRegex("Agent Url alternate command", r,
+		//		  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar",
+		//		  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar");
 
 	}
 
-- 
cgit v1.2.3


From 146e9d5e4d9a9a4f33d9ccd47a901980972b7ab9 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 1 Feb 2010 17:06:18 -0800
Subject: Support returning full_name (and SLID) for LLCacheName::get() calls
 Changed callback signature to full_name instead of first_name,last_name
 Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
 Change Pay dialog names to SLURL links Tweaked layout of Pay Resident and Pay
 via Object floaters to make SLURLs fit Consolidate name first + " " + last
 concatenation in LLCacheName::buildFullName() Reviewed with Kelly

---
 indra/llui/lltextbase.cpp            |  2 +-
 indra/llui/llurlentry.cpp            | 11 +++++------
 indra/llui/llurlentry.h              |  3 +--
 indra/llui/tests/llurlentry_stub.cpp |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 17aecaf32f..790240ab48 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2493,7 +2493,7 @@ S32	LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 lin
 	LLUIImagePtr image = mStyle->getImage();
 	if( image.notNull())
 	{
-		num_pixels -= image->getWidth();
+		num_pixels = llmax(0, num_pixels - image->getWidth());
 	}
 
 	// search for newline and if found, truncate there
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index d04cb8c7ff..40f8c27431 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -315,12 +315,11 @@ LLUrlEntryGroup::LLUrlEntryGroup()
 }
 
 void LLUrlEntryGroup::onGroupNameReceived(const LLUUID& id,
-										  const std::string& first,
-										  const std::string& last,
-										  BOOL is_group)
+										  const std::string& name,
+										  bool is_group)
 {
 	// received the group name from the server - tell our observers
-	callObservers(id.asString(), first);
+	callObservers(id.asString(), name);
 }
 
 std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
@@ -350,9 +349,9 @@ std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCa
 	}
 	else
 	{
-		gCacheName->get(group_id, TRUE,
+		gCacheName->get(group_id, true,
 			boost::bind(&LLUrlEntryGroup::onGroupNameReceived,
-				this, _1, _2, _3, _4));
+				this, _1, _2, _3));
 		addObserver(group_id_string, url, cb);
 		return LLTrans::getString("LoadingData");
 	}
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 33ec9d82a9..6d875a40c7 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -168,8 +168,7 @@ public:
 	LLUrlEntryGroup();
 	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
 private:
-	void onGroupNameReceived(const LLUUID& id, const std::string& first,
-							 const std::string& last, BOOL is_group);
+	void onGroupNameReceived(const LLUUID& id, const std::string& name, bool is_group);
 };
 
 ///
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 3731800adf..30bab1eb91 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -49,7 +49,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 	return TRUE;
 }
 
-boost::signals2::connection LLCacheName::get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback)
+boost::signals2::connection LLCacheName::get(const LLUUID& id, bool is_group, const LLCacheNameCallback& callback)
 {
 	return boost::signals2::connection();
 }
-- 
cgit v1.2.3


From d489216b6ef41f0d22f3a9062ba6daacc67bc038 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 3 Feb 2010 12:48:40 -0800
Subject: Moved LLUrlEntryAgent back into llui library in prep for merge

---
 indra/llui/llurlentry.cpp            | 127 ++++++++++++++++++++++++++++++++++-
 indra/llui/llurlentry.h              |  12 +++-
 indra/llui/llurlregistry.cpp         |   2 +-
 indra/llui/tests/llurlentry_test.cpp |  36 +++++-----
 4 files changed, 155 insertions(+), 22 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 40f8c27431..7a62ca5098 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -297,7 +297,132 @@ std::string LLUrlEntrySLURL::getLocation(const std::string &url) const
 	return url.substr(pos, url.size() - pos);
 }
 
-// LLUrlEntryAgent temporarily moved to newview IDEVO
+//
+// LLUrlEntryAgent Describes a Second Life agent Url, e.g.,
+// secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+//
+LLUrlEntryAgent::LLUrlEntryAgent()
+{
+	mPattern = boost::regex("secondlife:///app/agent/[\\da-f-]+/\\w+",
+							boost::regex::perl|boost::regex::icase);
+	mMenuName = "menu_url_agent.xml";
+	mIcon = "Generic_Person";
+	mColor = LLUIColorTable::instance().getColor("AgentLinkColor");
+}
+
+// IDEVO demo code
+static std::string clean_name(const std::string& full_name)
+{
+	std::string displayname;
+	if (full_name == "miyazaki23") // IDEVO demo code
+	{
+		// miyazaki
+		displayname += (char)(0xE5);
+		displayname += (char)(0xAE);
+		displayname += (char)(0xAE);
+		displayname += (char)(0xE5);
+		displayname += (char)(0xB4);
+		displayname += (char)(0x8E);
+		// hayao
+		displayname += (char)(0xE9);
+		displayname += (char)(0xA7);
+		displayname += (char)(0xBF);
+		// san
+		displayname += (char)(0xE3);
+		displayname += (char)(0x81);
+		displayname += (char)(0x95);
+		displayname += (char)(0xE3);
+		displayname += (char)(0x82);
+		displayname += (char)(0x93);
+	}
+	else if (full_name == "Jim Linden")
+	{
+		displayname = "Jos";
+		displayname += (char)(0xC3);
+		displayname += (char)(0xA9);
+		displayname += " Sanchez";
+	}
+	else if (full_name == "James Linden")
+	{
+		displayname = "James Cook";
+	}
+	else if (full_name == "Hamilton Linden")
+	{
+		displayname = "Hamilton Hitchings";
+	}
+	else if (full_name == "Rome Linden")
+	{
+		displayname = "Rome Portlock";
+	}
+	else if (full_name == "M Linden")
+	{
+		displayname = "Mark Kingdon";
+	}
+	else if (full_name == "T Linden")
+	{
+		displayname = "Tom Hale";
+	}
+	else if (full_name == "Callen Linden")
+	{
+		displayname = "Christina Allen";
+	}
+	
+	std::string final;
+	if (!displayname.empty())
+	{
+		final = displayname + " (" + full_name + ")";
+	}
+	else
+	{
+		final = full_name;
+	}
+	return final;
+}
+
+void LLUrlEntryAgent::onNameCache(const LLUUID& id,
+								  const std::string& full_name,
+								  bool is_group)
+{
+	std::string final = clean_name(full_name);
+	// received the agent name from the server - tell our observers
+	callObservers(id.asString(), final);
+}
+
+std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
+{
+	if (!gCacheName)
+	{
+		// probably at the login screen, use short string for layout
+		return LLTrans::getString("LoadingData");
+	}
+	
+	std::string agent_id_string = getIDStringFromUrl(url);
+	if (agent_id_string.empty())
+	{
+		// something went wrong, just give raw url
+		return unescapeUrl(url);
+	}
+	
+	LLUUID agent_id(agent_id_string);
+	std::string full_name;
+	if (agent_id.isNull())
+	{
+		return LLTrans::getString("AvatarNameNobody");
+	}
+	else if (gCacheName->getFullName(agent_id, full_name))
+	{
+		return clean_name(full_name);
+	}
+	else
+	{
+		gCacheName->get(agent_id, false,
+						boost::bind(&LLUrlEntryAgent::onNameCache,
+									this, _1, _2, _3));
+		addObserver(agent_id_string, url, cb);
+		return LLTrans::getString("LoadingData");
+	}
+}
+
 
 //
 // LLUrlEntryGroup Describes a Second Life group Url, e.g.,
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 6d875a40c7..4fc2eb5e05 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -156,7 +156,17 @@ public:
 	/*virtual*/ std::string getLocation(const std::string &url) const;
 };
 
-/// IDEVO LLUrlEntryAgent temporarily moved to newview
+///
+/// LLUrlEntryAgent Describes a Second Life agent Url, e.g.,
+/// secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+class LLUrlEntryAgent : public LLUrlEntryBase
+{
+public:
+	LLUrlEntryAgent();
+	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
+private:
+	void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group);
+};
 
 ///
 /// LLUrlEntryGroup Describes a Second Life group Url, e.g.,
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 4fbdae9d38..419d2322f9 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -49,7 +49,7 @@ LLUrlRegistry::LLUrlRegistry()
 	registerUrl(new LLUrlEntrySLURL());
 	registerUrl(new LLUrlEntryHTTP());
 	registerUrl(new LLUrlEntryHTTPLabel());
-	// IDEVO registerUrl(new LLUrlEntryAgent());
+	registerUrl(new LLUrlEntryAgent());
 	registerUrl(new LLUrlEntryGroup());
 	registerUrl(new LLUrlEntryParcel());
 	registerUrl(new LLUrlEntryTeleport());
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 9200708784..30b59859d3 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -266,30 +266,28 @@ namespace tut
 		//
 		// test LLUrlEntryAgent - secondlife://app/agent Urls
 		//
-		// IDEVO - moved temporarily into newview, not available for test
-		//LLUrlEntryAgent url;
-		//boost::regex r = url.getPattern();
-
-		//testRegex("Invalid Agent Url", r,
-		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-XXXX-fd37083abc4c/about",
-		//		  "");
+		LLUrlEntryAgent url;
+		boost::regex r = url.getPattern();
 
-		//testRegex("Agent Url ", r,
-		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about",
-		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
+		testRegex("Invalid Agent Url", r,
+				  "secondlife:///app/agent/0e346d8b-4433-4d66-XXXX-fd37083abc4c/about",
+				  "");
 
-		//testRegex("Agent Url in text", r,
-		//		  "XXX secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about XXX",
-		//		  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
+		testRegex("Agent Url ", r,
+				  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about",
+				  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
 
-		//testRegex("Agent Url multicase", r,
-		//		  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About XXX",
-		//		  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About");
+		testRegex("Agent Url in text", r,
+				  "XXX secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about XXX",
+				  "secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about");
 
-		//testRegex("Agent Url alternate command", r,
-		//		  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar",
-		//		  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar");
+		testRegex("Agent Url multicase", r,
+				  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About XXX",
+				  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/About");
 
+		testRegex("Agent Url alternate command", r,
+				  "XXX secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar",
+				  "secondlife:///App/AGENT/0E346D8B-4433-4d66-a6b0-fd37083abc4c/foobar");
 	}
 
 	template<> template<>
-- 
cgit v1.2.3


From 33e613531f929b5bce04c11a355085fe5ea92997 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 4 Feb 2010 22:19:15 -0800
Subject: Fix placement of icon next to linked agent/group names. Suppresses
 rendering of text in LLNormalTextSegment that represent an icon, properly
 computes vertical spacing based on font height, and adds padding to the right
 of the icon.

---
 indra/llui/lltextbase.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 2b1e2b8226..e923e60db4 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1574,8 +1574,10 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c
 				{
 					LLStyle::Params icon;
 					icon.image = image;
-					// HACK: fix spacing of images and remove the fixed char spacing
-					appendAndHighlightText("   ", prepend_newline, part, icon);
+					// Text will be replaced during rendering with the icon,
+					// but string cannot be empty or the segment won't be
+					// added (or drawn).
+					appendAndHighlightText(" ", prepend_newline, part, icon);
 					prepend_newline = false;
 				}
 			}
@@ -2296,14 +2298,21 @@ F32 LLNormalTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selec
 	{
 		if ( mStyle->isImage() && (start >= 0) && (end <= mEnd - mStart))
 		{
+			// ...for images, only render the image, not the underlying text,
+			// which is only a placeholder space
 			LLColor4 color = LLColor4::white % mEditor.getDrawContext().mAlpha;
 			LLUIImagePtr image = mStyle->getImage();
 			S32 style_image_height = image->getHeight();
 			S32 style_image_width = image->getWidth();
-			// Center the image vertically
-			S32 image_bottom = draw_rect.getCenterY() - (style_image_height/2);
+			// Text is drawn from the top of the draw_rect downward
+			S32 text_center = draw_rect.mTop - (mFontHeight / 2);
+			// Align image to center of text
+			S32 image_bottom = text_center - (style_image_height / 2);
 			image->draw(draw_rect.mLeft, image_bottom, 
 				style_image_width, style_image_height, color);
+			
+			const S32 IMAGE_HPAD = 2;
+			return draw_rect.mLeft + style_image_width + IMAGE_HPAD;
 		}
 
 		return drawClippedSegment( getStart() + start, getStart() + end, selection_start, selection_end, draw_rect);
-- 
cgit v1.2.3


From 42176145c9e81dd99b65f88152df50a7b3ccf834 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 8 Feb 2010 14:55:30 -0800
Subject: Converted names build from avatar object LLNameValue pairs to SLID
 Added temporary getDisplayName() to LLCacheName Moved temporary placeholder
 display names into LLCacheName Eliminated rarely used LLAgentUI::buildName in
 favor of buildFullName Standardized buildFullName capitalization

---
 indra/llui/llurlentry.cpp            | 65 ++++--------------------------------
 indra/llui/llurlentry.h              |  1 +
 indra/llui/tests/llurlentry_stub.cpp |  7 ++--
 3 files changed, 10 insertions(+), 63 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 0bbf1fe084..0b68b66ff9 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -312,66 +312,13 @@ LLUrlEntryAgent::LLUrlEntryAgent()
 }
 
 // IDEVO demo code
-static std::string clean_name(const std::string& full_name)
+std::string LLUrlEntryAgent::buildName(const LLUUID& id, const std::string& full_name)
 {
-	std::string displayname;
-	if (full_name == "miyazaki23") // IDEVO demo code
-	{
-		// miyazaki
-		displayname += (char)(0xE5);
-		displayname += (char)(0xAE);
-		displayname += (char)(0xAE);
-		displayname += (char)(0xE5);
-		displayname += (char)(0xB4);
-		displayname += (char)(0x8E);
-		// hayao
-		displayname += (char)(0xE9);
-		displayname += (char)(0xA7);
-		displayname += (char)(0xBF);
-		// san
-		displayname += (char)(0xE3);
-		displayname += (char)(0x81);
-		displayname += (char)(0x95);
-		displayname += (char)(0xE3);
-		displayname += (char)(0x82);
-		displayname += (char)(0x93);
-	}
-	else if (full_name == "Jim Linden")
-	{
-		displayname = "Jos";
-		displayname += (char)(0xC3);
-		displayname += (char)(0xA9);
-		displayname += " Sanchez";
-	}
-	else if (full_name == "James Linden")
-	{
-		displayname = "James Cook";
-	}
-	else if (full_name == "Hamilton Linden")
-	{
-		displayname = "Hamilton Hitchings";
-	}
-	else if (full_name == "Rome Linden")
-	{
-		displayname = "Rome Portlock";
-	}
-	else if (full_name == "M Linden")
-	{
-		displayname = "Mark Kingdon";
-	}
-	else if (full_name == "T Linden")
-	{
-		displayname = "Tom Hale";
-	}
-	else if (full_name == "Callen Linden")
-	{
-		displayname = "Christina Allen";
-	}
-	
 	std::string final;
-	if (!displayname.empty())
+	std::string display_name;
+	if (gCacheName->getDisplayName(id, display_name))
 	{
-		final = displayname + " (" + full_name + ")";
+		final = display_name + " (" + full_name + ")";
 	}
 	else
 	{
@@ -384,7 +331,7 @@ void LLUrlEntryAgent::onNameCache(const LLUUID& id,
 								  const std::string& full_name,
 								  bool is_group)
 {
-	std::string final = clean_name(full_name);
+	std::string final = buildName(id, full_name);
 	// received the agent name from the server - tell our observers
 	callObservers(id.asString(), final);
 }
@@ -412,7 +359,7 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	}
 	else if (gCacheName->getFullName(agent_id, full_name))
 	{
-		return clean_name(full_name);
+		return buildName(agent_id, full_name);
 	}
 	else
 	{
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index e6844b595c..77802957a3 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -170,6 +170,7 @@ public:
 	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
 private:
 	void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group);
+	std::string buildName(const LLUUID& id, const std::string& full_name);
 };
 
 ///
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 30bab1eb91..35c49fc37f 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -36,11 +36,10 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
 	return TRUE;
 }
 
-BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& last)
+bool LLCacheName::getDisplayName(const LLUUID& id, std::string& display_name)
 {
-	first = "Lynx";
-	last = "Linden";
-	return TRUE;
+	display_name = "";
+	return false;
 }
 
 BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
-- 
cgit v1.2.3


From c2373fb5a6b08b2c32e5f93fa67b25f669e8b47f Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 11 Feb 2010 16:39:15 -0800
Subject: Created stub LLAvatarNameCache for display name lookup, as well as
 LLAvatarName base data object. Reviewed with Kelly.

---
 indra/llui/llurlentry.cpp            | 22 ++++++++--------------
 indra/llui/llurlentry.h              |  3 ++-
 indra/llui/tests/llurlentry_stub.cpp |  7 +++++++
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 0b68b66ff9..dae2c44f08 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -35,6 +35,7 @@
 #include "llurlentry.h"
 #include "lluri.h"
 
+#include "llavatarnamecache.h"
 #include "llcachename.h"
 #include "lltrans.h"
 #include "lluicolortable.h"
@@ -312,26 +313,19 @@ LLUrlEntryAgent::LLUrlEntryAgent()
 }
 
 // IDEVO demo code
-std::string LLUrlEntryAgent::buildName(const LLUUID& id, const std::string& full_name)
+std::string LLUrlEntryAgent::buildName(const LLUUID& id)
 {
-	std::string final;
-	std::string display_name;
-	if (gCacheName->getDisplayName(id, display_name))
-	{
-		final = display_name + " (" + full_name + ")";
-	}
-	else
-	{
-		final = full_name;
-	}
-	return final;
+	// JAMESDEBUG HACK: assume name is there
+	LLAvatarName av_name;
+	LLAvatarNameCache::get(id, &av_name);
+	return av_name.mDisplayName + " (" + av_name.mSLID + ")";
 }
 
 void LLUrlEntryAgent::onNameCache(const LLUUID& id,
 								  const std::string& full_name,
 								  bool is_group)
 {
-	std::string final = buildName(id, full_name);
+	std::string final = buildName(id);
 	// received the agent name from the server - tell our observers
 	callObservers(id.asString(), final);
 }
@@ -359,7 +353,7 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	}
 	else if (gCacheName->getFullName(agent_id, full_name))
 	{
-		return buildName(agent_id, full_name);
+		return buildName(agent_id);
 	}
 	else
 	{
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 77802957a3..2bc21eb989 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -168,9 +168,10 @@ class LLUrlEntryAgent : public LLUrlEntryBase
 public:
 	LLUrlEntryAgent();
 	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
+
 private:
 	void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group);
-	std::string buildName(const LLUUID& id, const std::string& full_name);
+	std::string buildName(const LLUUID& id);
 };
 
 ///
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 35c49fc37f..016969451e 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -22,11 +22,18 @@
 
 #include "llstring.h"
 #include "llfile.h"
+#include "llavatarnamecache.h"
 #include "llcachename.h"
 #include "lluuid.h"
 
 #include <string>
 
+// Stub for LLAvatarNameCache
+bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
+{
+	return false;
+}
+
 //
 // Stub implementation for LLCacheName
 //
-- 
cgit v1.2.3


From 3581d0001e2506389f41ce46f5007cc6f40f2d6a Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 11 Feb 2010 16:46:07 -0800
Subject: Fixed test build problem

---
 indra/llui/tests/llurlentry_stub.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 016969451e..1f8c4d2f22 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -43,12 +43,6 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
 	return TRUE;
 }
 
-bool LLCacheName::getDisplayName(const LLUUID& id, std::string& display_name)
-{
-	display_name = "";
-	return false;
-}
-
 BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 {
 	group = "My Group";
-- 
cgit v1.2.3


From c16591c046fa76fc5d13387efa3bcaec3422e593 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 12 Feb 2010 16:12:12 -0800
Subject: Per-avatar customizable icons next to name links in text Changed
 LLUrlEntryAgent callbacks to handle both link label and icon Eliminated
 legacy LLNameCache file loading Reviewed with Kelly

---
 indra/llui/lltextbase.cpp    | 47 +++++++++++++++++++++++++++++-----
 indra/llui/lltextbase.h      |  5 +++-
 indra/llui/llurlentry.cpp    | 61 +++++++++++++++++++++++++++++++++-----------
 indra/llui/llurlentry.h      |  9 ++++---
 indra/llui/llurlregistry.cpp |  4 +--
 indra/llui/llurlregistry.h   |  4 ++-
 6 files changed, 100 insertions(+), 30 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index ef422dbdc5..075f54ed30 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1527,6 +1527,20 @@ std::string LLTextBase::getText() const
 	return getViewModel()->getValue().asString();
 }
 
+// IDEVO - icons can be UI image names or UUID sent from
+// server with avatar display name
+static LLUIImagePtr image_from_icon_name(const std::string& icon_name)
+{
+	if (LLUUID::validate(icon_name))
+	{
+		return LLUI::getUIImageByID( LLUUID(icon_name) );
+	}
+	else
+	{
+		return LLUI::getUIImage(icon_name);
+	}
+}
+
 void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, const LLStyle::Params& input_params)
 {
 	LLStyle::Params style_params(input_params);
@@ -1539,7 +1553,7 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c
 		LLUrlMatch match;
 		std::string text = new_text;
 		while ( LLUrlRegistry::instance().findUrl(text, match,
-		        boost::bind(&LLTextBase::replaceUrlLabel, this, _1, _2)) )
+		        boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3)) )
 		{
 			start = match.getStart();
 			end = match.getEnd()+1;
@@ -1570,15 +1584,18 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c
 			// output an optional icon before the Url
 			if (! match.getIcon().empty())
 			{
-				LLUIImagePtr image = LLUI::getUIImage(match.getIcon());
+				LLUIImagePtr image = image_from_icon_name( match.getIcon() );
 				if (image)
 				{
-					LLStyle::Params icon;
-					icon.image = image;
+					LLStyle::Params icon_params;
+					icon_params.image = image;
+					// must refer to our link so we can update the icon later
+					// after name/group data is looked up
+					icon_params.link_href = match.getUrl();
 					// Text will be replaced during rendering with the icon,
 					// but string cannot be empty or the segment won't be
 					// added (or drawn).
-					appendAndHighlightText("   ", prepend_newline, part, icon);
+					appendAndHighlightText(" ", prepend_newline, part, icon_params);
 					prepend_newline = false;
 				}
 			}
@@ -1728,8 +1745,9 @@ void LLTextBase::appendAndHighlightText(const std::string &new_text, bool prepen
 }
 
 
-void LLTextBase::replaceUrlLabel(const std::string &url,
-								   const std::string &label)
+void LLTextBase::replaceUrl(const std::string &url,
+							const std::string &label,
+							const std::string &icon)
 {
 	// get the full (wide) text for the editor so we can change it
 	LLWString text = getWText();
@@ -1759,6 +1777,21 @@ void LLTextBase::replaceUrlLabel(const std::string &url,
 			modified = true;
 		}
 
+		// Icon might be updated when more avatar or group info
+		// becomes available
+		if (style->isImage() && style->getLinkHREF() == url)
+		{
+			LLUIImagePtr image = image_from_icon_name( icon );
+			if (image)
+			{
+				LLStyle::Params icon_params;
+				icon_params.image = image;
+				LLStyleConstSP new_style(new LLStyle(icon_params));
+				seg->setStyle(new_style);
+				modified = true;
+			}
+		}
+
 		// work out the character offset for the next segment
 		seg_start = seg->getEnd();
 	}
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 3dda6f4cc8..dc8bc0dca0 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -309,7 +309,10 @@ protected:
 	// misc
 	void							updateRects();
 	void							needsScroll() { mScrollNeeded = TRUE; }
-	void							replaceUrlLabel(const std::string &url, const std::string &label);
+
+	// Replace a URL with a new icon and label, for example, when
+	// avatar names are looked up.
+	void replaceUrl(const std::string &url, const std::string &label, const std::string& icon);
 
 protected:
 	// text segmentation and flow
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index dae2c44f08..dbfac63a72 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -55,6 +55,12 @@ std::string LLUrlEntryBase::getUrl(const std::string &string) const
 	return escapeUrl(string);
 }
 
+//virtual
+std::string LLUrlEntryBase::getIcon(const std::string &url) const
+{
+	return mIcon;
+}
+
 std::string LLUrlEntryBase::getIDStringFromUrl(const std::string &url) const
 {
 	// return the id from a SLURL in the format /app/{cmd}/{id}/about
@@ -133,7 +139,9 @@ void LLUrlEntryBase::addObserver(const std::string &id,
 	}
 }
  
-void LLUrlEntryBase::callObservers(const std::string &id, const std::string &label)
+void LLUrlEntryBase::callObservers(const std::string &id,
+								   const std::string &label,
+								   const std::string &icon)
 {
 	// notify all callbacks waiting on the given uuid
 	std::multimap<std::string, LLUrlEntryObserver>::iterator it;
@@ -141,7 +149,7 @@ void LLUrlEntryBase::callObservers(const std::string &id, const std::string &lab
 	{
 		// call the callback - give it the new label
 		LLUrlEntryObserver &observer = it->second;
-		(*observer.signal)(it->second.url, label);
+		(*observer.signal)(it->second.url, label, icon);
 		// then remove the signal - we only need to call it once
 		delete observer.signal;
 		mObservers.erase(it++);
@@ -312,22 +320,18 @@ LLUrlEntryAgent::LLUrlEntryAgent()
 	mColor = LLUIColorTable::instance().getColor("AgentLinkColor");
 }
 
-// IDEVO demo code
-std::string LLUrlEntryAgent::buildName(const LLUUID& id)
-{
-	// JAMESDEBUG HACK: assume name is there
-	LLAvatarName av_name;
-	LLAvatarNameCache::get(id, &av_name);
-	return av_name.mDisplayName + " (" + av_name.mSLID + ")";
-}
-
 void LLUrlEntryAgent::onNameCache(const LLUUID& id,
 								  const std::string& full_name,
 								  bool is_group)
 {
-	std::string final = buildName(id);
+	// IDEVO demo code
+	LLAvatarName av_name;
+	LLAvatarNameCache::get(id, &av_name);
+	std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
+	// use custom icon if available
+	std::string icon = (!av_name.mBadge.empty() ? av_name.mBadge : mIcon);
 	// received the agent name from the server - tell our observers
-	callObservers(id.asString(), final);
+	callObservers(id.asString(), label, icon);
 }
 
 std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
@@ -353,7 +357,10 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	}
 	else if (gCacheName->getFullName(agent_id, full_name))
 	{
-		return buildName(agent_id);
+		LLAvatarName av_name;
+		LLAvatarNameCache::get(agent_id, &av_name);
+		std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
+		return label;
 	}
 	else
 	{
@@ -366,6 +373,30 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 }
 
 
+std::string LLUrlEntryAgent::getIcon(const std::string &url) const
+{
+	std::string agent_id_string = getIDStringFromUrl(url);
+	if (agent_id_string.empty())
+	{
+		return mIcon;
+	}
+
+	LLUUID agent_id(agent_id_string);
+	if (agent_id.isNull())
+	{
+		return mIcon;
+	}
+
+	LLAvatarName av_name;
+	LLAvatarNameCache::get(agent_id, &av_name);
+	if (av_name.mBadge.empty())
+	{
+		return mIcon;
+	}
+
+	return av_name.mBadge;
+}
+
 //
 // LLUrlEntryGroup Describes a Second Life group Url, e.g.,
 // secondlife:///app/group/00005ff3-4044-c79f-9de8-fb28ae0df991/about
@@ -386,7 +417,7 @@ void LLUrlEntryGroup::onGroupNameReceived(const LLUUID& id,
 										  bool is_group)
 {
 	// received the group name from the server - tell our observers
-	callObservers(id.asString(), name);
+	callObservers(id.asString(), name, mIcon);
 }
 
 std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 2bc21eb989..1f0caeacf5 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -42,7 +42,8 @@
 #include <map>
 
 typedef boost::signals2::signal<void (const std::string& url,
-									  const std::string& label)> LLUrlLabelSignal;
+									  const std::string& label,
+									  const std::string& icon)> LLUrlLabelSignal;
 typedef LLUrlLabelSignal::slot_type LLUrlLabelCallback;
 
 ///
@@ -77,7 +78,7 @@ public:
 	virtual std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb) { return url; }
 
 	/// Return an icon that can be displayed next to Urls of this type
-	std::string getIcon() const { return mIcon; }
+	virtual std::string getIcon(const std::string &url) const;
 
 	/// Return the color to render the displayed text
 	LLUIColor getColor() const { return mColor; }
@@ -101,7 +102,7 @@ protected:
 	std::string getLabelFromWikiLink(const std::string &url) const;
 	std::string getUrlFromWikiLink(const std::string &string) const;
 	void addObserver(const std::string &id, const std::string &url, const LLUrlLabelCallback &cb); 
-	void callObservers(const std::string &id, const std::string &label);
+	void callObservers(const std::string &id, const std::string &label, const std::string& icon);
 
 	typedef struct {
 		std::string url;
@@ -168,10 +169,10 @@ class LLUrlEntryAgent : public LLUrlEntryBase
 public:
 	LLUrlEntryAgent();
 	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
+	/*virtual*/ std::string getIcon(const std::string &url) const;
 
 private:
 	void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group);
-	std::string buildName(const LLUUID& id);
 };
 
 ///
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 5db1f46b8d..1ee87a01de 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -37,7 +37,7 @@
 #include <boost/regex.hpp>
 
 // default dummy callback that ignores any label updates from the server
-void LLUrlRegistryNullCallback(const std::string &url, const std::string &label)
+void LLUrlRegistryNullCallback(const std::string &url, const std::string &label, const std::string& icon)
 {
 }
 
@@ -180,7 +180,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
 						match_entry->getUrl(url),
 						match_entry->getLabel(url, cb),
 						match_entry->getTooltip(),
-						match_entry->getIcon(),
+						match_entry->getIcon(url),
 						match_entry->getColor(),
 						match_entry->getMenuName(),
 						match_entry->getLocation(url),
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h
index 6d47c2c2a2..dffbd9d4bf 100644
--- a/indra/llui/llurlregistry.h
+++ b/indra/llui/llurlregistry.h
@@ -43,7 +43,9 @@
 #include <vector>
 
 /// This default callback for findUrl() simply ignores any label updates
-void LLUrlRegistryNullCallback(const std::string &url, const std::string &label);
+void LLUrlRegistryNullCallback(const std::string &url,
+							   const std::string &label,
+							   const std::string &icon);
 
 ///
 /// LLUrlRegistry is a singleton that contains a set of Url types that
-- 
cgit v1.2.3


From 65d388d162dc14f5b8b3e0bfff1ae1125736f564 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 16 Feb 2010 11:58:21 -0800
Subject: Fix display of SLID-only accounts - prototype display name code was
 putting duplicate name in parentheses.

---
 indra/llui/llurlentry.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index dbfac63a72..ef48f6cd4f 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -326,12 +326,18 @@ void LLUrlEntryAgent::onNameCache(const LLUUID& id,
 {
 	// IDEVO demo code
 	LLAvatarName av_name;
-	LLAvatarNameCache::get(id, &av_name);
-	std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
-	// use custom icon if available
-	std::string icon = (!av_name.mBadge.empty() ? av_name.mBadge : mIcon);
-	// received the agent name from the server - tell our observers
-	callObservers(id.asString(), label, icon);
+	if (LLAvatarNameCache::get(id, &av_name))
+	{
+		std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
+		// use custom icon if available
+		std::string icon = (!av_name.mBadge.empty() ? av_name.mBadge : mIcon);
+		// received the agent name from the server - tell our observers
+		callObservers(id.asString(), label, icon);
+	}
+	else
+	{
+		callObservers(id.asString(), full_name, mIcon);
+	}
 }
 
 std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
@@ -358,9 +364,10 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	else if (gCacheName->getFullName(agent_id, full_name))
 	{
 		LLAvatarName av_name;
-		LLAvatarNameCache::get(agent_id, &av_name);
-		std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
-		return label;
+		if (LLAvatarNameCache::get(agent_id, &av_name))
+			return av_name.mDisplayName + " (" + av_name.mSLID + ")";
+		else
+			return full_name;
 	}
 	else
 	{
-- 
cgit v1.2.3


From 55bfb4435e1a2ffc34578bf30877eb24a5edaa29 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 17 Feb 2010 16:55:58 -0800
Subject: Look up display names via a web service Also removed unused
 LLComboBox globals to reduce llappviewer.cpp include file burden. Review
 pending

---
 indra/llui/llcombobox.cpp | 2 --
 indra/llui/llcombobox.h   | 3 ---
 2 files changed, 5 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 9d23daf56d..1aa44f6b96 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -58,8 +58,6 @@
 #include "lltooltip.h"
 
 // Globals
-S32 LLCOMBOBOX_HEIGHT = 0;
-S32 LLCOMBOBOX_WIDTH = 0;
 S32 MAX_COMBO_WIDTH = 500;
 
 static LLDefaultChildRegistry::Register<LLComboBox> register_combo_box("combo_box");
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 4f27588467..58e29dcb30 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -49,9 +49,6 @@
 class LLFontGL;
 class LLViewBorder;
 
-extern S32 LLCOMBOBOX_HEIGHT;
-extern S32 LLCOMBOBOX_WIDTH;
-
 class LLComboBox
 :	public LLUICtrl, public LLCtrlListInterface
 {
-- 
cgit v1.2.3


From ee81adb01b8619302898471fdbba5c93f716d10b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 18 Feb 2010 18:46:41 -0800
Subject: Preference to set what fields name tags display, and first attempt at
 "use display names" menu item which doesn't work yet

---
 indra/llui/llurlentry.cpp            | 6 ++++--
 indra/llui/tests/llurlentry_stub.cpp | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index ef48f6cd4f..74b9468c26 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -326,7 +326,8 @@ void LLUrlEntryAgent::onNameCache(const LLUUID& id,
 {
 	// IDEVO demo code
 	LLAvatarName av_name;
-	if (LLAvatarNameCache::get(id, &av_name))
+	if (LLAvatarNameCache::useDisplayNames()
+		&& LLAvatarNameCache::get(id, &av_name))
 	{
 		std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
 		// use custom icon if available
@@ -364,7 +365,8 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	else if (gCacheName->getFullName(agent_id, full_name))
 	{
 		LLAvatarName av_name;
-		if (LLAvatarNameCache::get(agent_id, &av_name))
+		if (LLAvatarNameCache::useDisplayNames()
+			&& LLAvatarNameCache::get(agent_id, &av_name))
 			return av_name.mDisplayName + " (" + av_name.mSLID + ")";
 		else
 			return full_name;
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 1f8c4d2f22..280554b954 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -34,6 +34,11 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 	return false;
 }
 
+bool LLAvatarNameCache::useDisplayNames()
+{
+	return false;
+}
+
 //
 // Stub implementation for LLCacheName
 //
-- 
cgit v1.2.3


From 75cc897c062ffb4d59649a7af760d5e89396a3f8 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 3 Mar 2010 10:10:55 -0800
Subject: Underlined display names now update reliably.

---
 indra/llui/llurlentry.cpp            | 61 ++++++++++++++++++++++--------------
 indra/llui/llurlentry.h              |  3 ++
 indra/llui/tests/llurlentry_stub.cpp |  5 +++
 3 files changed, 45 insertions(+), 24 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 22920d1656..5a2956311e 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -323,22 +323,19 @@ LLUrlEntryAgent::LLUrlEntryAgent()
 void LLUrlEntryAgent::onNameCache(const LLUUID& id,
 								  const std::string& full_name,
 								  bool is_group)
+{
+	callObservers(id.asString(), full_name, mIcon);
+}
+
+void LLUrlEntryAgent::onAvatarNameCache(const LLUUID& id,
+										const LLAvatarName& av_name)
 {
 	// IDEVO demo code
-	LLAvatarName av_name;
-	if (LLAvatarNameCache::useDisplayNames()
-		&& LLAvatarNameCache::get(id, &av_name))
-	{
-		std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
-		// use custom icon if available
-		std::string icon = (!av_name.mBadge.empty() ? av_name.mBadge : mIcon);
-		// received the agent name from the server - tell our observers
-		callObservers(id.asString(), label, icon);
-	}
-	else
-	{
-		callObservers(id.asString(), full_name, mIcon);
-	}
+	std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
+	// use custom icon if available
+	std::string icon = (!av_name.mBadge.empty() ? av_name.mBadge : mIcon);
+	// received the agent name from the server - tell our observers
+	callObservers(id.asString(), label, icon);
 }
 
 std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
@@ -357,27 +354,43 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	}
 	
 	LLUUID agent_id(agent_id_string);
-	std::string full_name;
 	if (agent_id.isNull())
 	{
 		return LLTrans::getString("AvatarNameNobody");
 	}
-	else if (gCacheName->getFullName(agent_id, full_name))
+
+	if (LLAvatarNameCache::useDisplayNames())
 	{
 		LLAvatarName av_name;
-		if (LLAvatarNameCache::useDisplayNames()
-			&& LLAvatarNameCache::get(agent_id, &av_name))
+		if (LLAvatarNameCache::get(agent_id, &av_name))
+		{
 			return av_name.mDisplayName + " (" + av_name.mSLID + ")";
+		}
 		else
-			return full_name;
+		{
+			LLAvatarNameCache::get(agent_id,
+				boost::bind(&LLUrlEntryAgent::onAvatarNameCache,
+					this, _1, _2));
+			addObserver(agent_id_string, url, cb);
+			return LLTrans::getString("LoadingData");
+		}
 	}
 	else
 	{
-		gCacheName->get(agent_id, false,
-						boost::bind(&LLUrlEntryAgent::onNameCache,
-									this, _1, _2, _3));
-		addObserver(agent_id_string, url, cb);
-		return LLTrans::getString("LoadingData");
+		// ...no display names
+		std::string full_name;
+		if (gCacheName->getFullName(agent_id, full_name))
+		{
+			return full_name;
+		}
+		else
+		{
+			gCacheName->get(agent_id, false,
+				boost::bind(&LLUrlEntryAgent::onNameCache,
+					this, _1, _2, _3));
+			addObserver(agent_id_string, url, cb);
+			return LLTrans::getString("LoadingData");
+		}
 	}
 }
 
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 1f0caeacf5..c075ccc30e 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -41,6 +41,8 @@
 #include <string>
 #include <map>
 
+class LLAvatarName;
+
 typedef boost::signals2::signal<void (const std::string& url,
 									  const std::string& label,
 									  const std::string& icon)> LLUrlLabelSignal;
@@ -173,6 +175,7 @@ public:
 
 private:
 	void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group);
+	void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name);
 };
 
 ///
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 280554b954..e984f5cf81 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -34,6 +34,11 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 	return false;
 }
 
+void LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot)
+{
+	return;
+}
+
 bool LLAvatarNameCache::useDisplayNames()
 {
 	return false;
-- 
cgit v1.2.3