summaryrefslogtreecommitdiff
path: root/indra/llui/llurlregistry.h
diff options
context:
space:
mode:
authorMartin Reddy <lynx@lindenlab.com>2009-09-24 10:41:08 +0000
committerMartin Reddy <lynx@lindenlab.com>2009-09-24 10:41:08 +0000
commit7b2737e0e14f815e69da7114dda693cdaea2c341 (patch)
tree0c2a1941ea55fc56b35faae47d55cae36578960b /indra/llui/llurlregistry.h
parentf5b66f353e0a958a1fa4b17a40d4014ba4f046c9 (diff)
EXT-944 EXT-1026: cleaning up my quick fix for these issues.
I've now added an explicit LLUrlRegistry::findUrl() method for LLWStrings. This deals with correcting the start/end range for the url appropriately. Now the API can be used without worrying about utf8/utf32 character offset issues. Internal JIRAs: DEV-40127 DEV-39966.
Diffstat (limited to 'indra/llui/llurlregistry.h')
-rw-r--r--indra/llui/llurlregistry.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h
index 84b033036c..85e934e4b5 100644
--- a/indra/llui/llurlregistry.h
+++ b/indra/llui/llurlregistry.h
@@ -37,10 +37,10 @@
#include "llurlentry.h"
#include "llurlmatch.h"
#include "llsingleton.h"
+#include "llstring.h"
#include <string>
#include <vector>
-#include <map>
/// This default callback for findUrl() simply ignores any label updates
void LLUrlRegistryNullCallback(const std::string &url, const std::string &label);
@@ -77,6 +77,10 @@ public:
bool findUrl(const std::string &text, LLUrlMatch &match,
const LLUrlLabelCallback &cb = &LLUrlRegistryNullCallback);
+ /// a slightly less efficient version of findUrl for wide strings
+ bool findUrl(const LLWString &text, LLUrlMatch &match,
+ const LLUrlLabelCallback &cb = &LLUrlRegistryNullCallback);
+
private:
LLUrlRegistry();
friend class LLSingleton<LLUrlRegistry>;