diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-06 17:51:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-06 17:51:07 -0700 |
| commit | 33d1aa30ab25cd0a0fd4bbd6728b1277e73c45d2 (patch) | |
| tree | aa737a3258a409e539f378744b990294bac6115d /indra/llui/llurlentry.cpp | |
| parent | 86ba458ebcc979bdd03b490842311bd5621fb0b4 (diff) | |
| parent | dc6c35e353b991db2651d26bc76e5b3ee9921157 (diff) | |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 472c15a240..c408f8d8b5 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -366,6 +366,11 @@ void LLUrlEntryAgent::onAvatarNameCache(const LLUUID& id, callObservers(id.asString(), label, mIcon); } +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 @@ -609,6 +614,8 @@ LLUrlEntryGroup::LLUrlEntryGroup() mTooltip = LLTrans::getString("TooltipGroupUrl"); } + + void LLUrlEntryGroup::onGroupNameReceived(const LLUUID& id, const std::string& name, bool is_group) @@ -617,6 +624,12 @@ void LLUrlEntryGroup::onGroupNameReceived(const LLUUID& id, callObservers(id.asString(), name, mIcon); } +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) |