Merged from viewer-release after resolving conflicts

1 files changed, 13 insertions, 0 deletions

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index fd56a87345..e075699a6e 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -326,6 +326,11 @@ void LLUrlEntryAgent::onAgentNameReceived(const LLUUID& id,
 	callObservers(id.asString(), first + " " + last);
 }
 
+LLUUID	LLUrlEntryAgent::getID(const std::string &string) const
+{
+	return LLUUID(getIDStringFromUrl(string));
+}
+
 std::string LLUrlEntryAgent::getTooltip(const std::string &string) const
 {
 	// return a tooltip corresponding to the URL type instead of the generic one
@@ -434,6 +439,8 @@ LLUrlEntryGroup::LLUrlEntryGroup()
 	mColor = LLUIColorTable::instance().getColor("GroupLinkColor");
 }
 
+
+
 void LLUrlEntryGroup::onGroupNameReceived(const LLUUID& id,
 										  const std::string& first,
 										  const std::string& last,
@@ -443,6 +450,12 @@ void LLUrlEntryGroup::onGroupNameReceived(const LLUUID& id,
 	callObservers(id.asString(), first);
 }
 
+LLUUID	LLUrlEntryGroup::getID(const std::string &string) const
+{
+	return LLUUID(getIDStringFromUrl(string));
+}
+
+
 std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
 {
 	if (!gCacheName)