automated merge

1 files changed, 15 insertions, 0 deletions

diff --git a/indra/llui/lltextutil.h b/indra/llui/lltextutil.h
index 325c3c5b7c..407880d195 100644
--- a/indra/llui/lltextutil.h
+++ b/indra/llui/lltextutil.h
@@ -36,6 +36,8 @@
 #include "llstyle.h"
 
 class LLTextBox;
+class LLUrlMatch;
+class LLTextBase;
 
 namespace LLTextUtil
 {
@@ -67,6 +69,19 @@ namespace LLTextUtil
 	 * @return reference to string with formatted phone number
 	 */
 	const std::string& formatPhoneNumber(const std::string& phone_str);
+
+	bool processUrlMatch(LLUrlMatch* match,LLTextBase* text_base);
+
+	class TextHelpers
+	{
+
+		//we need this special callback since we need to create LLAvataIconCtrls while parsing
+		//avatar/group url but can't create LLAvataIconCtrl from LLUI
+		public:
+			static boost::function<bool(LLUrlMatch*,LLTextBase*)> iconCallbackCreationFunction;
+	};
+
+	
 }
 
 #endif // LL_LLTEXTUTIL_H