diff options
author | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
commit | 2920d4c46f99c8c5bc8942a08a87fa204c57464b (patch) | |
tree | 515837435a28924b028815fc79f7f4f2ec18871e /indra/llui/lltextbase.h | |
parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
parent | d674d11f895b8f3d578cded931cdc1c430379c95 (diff) |
merge
Diffstat (limited to 'indra/llui/lltextbase.h')
-rw-r--r-- | indra/llui/lltextbase.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 8ed0680df9..3a3a5d0e20 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -314,7 +314,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 |