Merge from dessie/viewer-release

28 files changed, 3298 insertions, 3079 deletions

diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 20e4b7867c..37fc571bbd 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -44,7 +44,7 @@ static const std::string DD_BUTTON_NAME = "dd_button";
 static const std::string DD_TEXTBOX_NAME = "dd_textbox";
 static const std::string DD_HEADER_NAME = "dd_header";
 
-static const S32 HEADER_HEIGHT = 20;
+static const S32 HEADER_HEIGHT = 23;
 static const S32 HEADER_IMAGE_LEFT_OFFSET = 5;
 static const S32 HEADER_TEXT_LEFT_OFFSET = 30;
 static const F32 AUTO_OPEN_TIME = 1.f;
@@ -78,6 +78,8 @@ public:
 
 	void	setTitleFontStyle(std::string style);
 
+	void	setTitleColor(LLUIColor);
+
 	void	setSelected(bool is_selected) { mIsSelected = is_selected; }
 
 	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
@@ -192,6 +194,14 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleFontStyle(std::string
 	}
 }
 
+void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleColor(LLUIColor color)
+{
+	if(mHeaderTextbox)
+	{
+		mHeaderTextbox->setColor(color);
+	}
+}
+
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 {
 	S32 width = getRect().getWidth();
@@ -249,6 +259,15 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::reshape(S32 width, S32 height
 	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET,(height+header_height)/2 ,width,(height-header_height)/2);
 	mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
 	mHeaderTextbox->setRect(textboxRect);
+
+	if (mHeaderTextbox->getTextPixelWidth() > mHeaderTextbox->getRect().getWidth())
+	{
+		setToolTip(mHeaderTextbox->getText());
+	}
+	else
+	{
+		setToolTip(LLStringUtil::null);
+	}
 }
 
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseEnter(S32 x, S32 y, MASK mask)
@@ -520,6 +539,15 @@ void LLAccordionCtrlTab::setTitleFontStyle(std::string style)
 	}
 }
 
+void LLAccordionCtrlTab::setTitleColor(LLUIColor color)
+{
+	LLAccordionCtrlTabHeader* header = findChild<LLAccordionCtrlTabHeader>(DD_HEADER_NAME);
+	if (header)
+	{
+		header->setTitleColor(color);
+	}
+}
+
 boost::signals2::connection LLAccordionCtrlTab::setFocusReceivedCallback(const focus_signal_t::slot_type& cb)
 {
 	LLAccordionCtrlTabHeader* header = findChild<LLAccordionCtrlTabHeader>(DD_HEADER_NAME);
@@ -989,6 +1017,7 @@ BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 	{
 		//inside tab header
 		//fix for EXT-6619
+		mHeader->handleToolTip(x, y, mask);
 		return TRUE;
 	}
 	return LLUICtrl::handleToolTip(x, y, mask);
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index e17ecc5319..5646a355d0 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -124,6 +124,9 @@ public:
 	// Set text font style in LLAccordionCtrlTabHeader
 	void setTitleFontStyle(std::string style);
 
+	// Set text color in LLAccordionCtrlTabHeader
+	void setTitleColor(LLUIColor color);
+
 	boost::signals2::connection setFocusReceivedCallback(const focus_signal_t::slot_type& cb);
 	boost::signals2::connection setFocusLostCallback(const focus_signal_t::slot_type& cb);
 
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 34f3049f2e..39e46a7ccb 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -1162,3 +1162,10 @@ void LLButton::resetMouseDownTimer()
 	mMouseDownTimer.stop();
 	mMouseDownTimer.reset();
 }
+
+
+BOOL LLButton::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+	// just treat a double click as a second click
+	return handleMouseDown(x, y, mask);
+}
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 9bd566d3c9..f4af19b696 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -152,6 +152,7 @@ public:
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);	
+	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual void	draw();
 	/*virtual*/ BOOL postBuild();
 
@@ -229,6 +230,8 @@ public:
 	
 	void			setFont(const LLFontGL *font)		
 		{ mGLFont = ( font ? font : LLFontGL::getFontSansSerif()); }
+	const LLFontGL* getFont() const { return mGLFont; }
+
 
 	S32				getLastDrawCharsCount() const { return mLastDrawCharsCount; }
 
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 2433c14315..b87851490d 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -50,14 +50,21 @@ LLFlatListView::Params::Params()
 	allow_select("allow_select"),
 	multi_select("multi_select"),
 	keep_one_selected("keep_one_selected"),
+	keep_selection_visible_on_reshape("keep_selection_visible_on_reshape",false),
 	no_items_text("no_items_text")
 {};
 
 void LLFlatListView::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
 {
+	S32 delta = height - getRect().getHeight();
 	LLScrollContainer::reshape(width, height, called_from_parent);
 	setItemsNoScrollWidth(width);
 	rearrangeItems();
+	
+	if(delta!= 0 && mKeepSelectionVisibleOnReshape)
+	{
+		ensureSelectedVisible();
+	}
 }
 
 const LLRect& LLFlatListView::getItemsRect() const
@@ -380,6 +387,7 @@ LLFlatListView::LLFlatListView(const LLFlatListView::Params& p)
   , mPrevNotifyParentRect(LLRect())
   , mNoItemsCommentTextbox(NULL)
   , mIsConsecutiveSelection(false)
+  , mKeepSelectionVisibleOnReshape(p.keep_selection_visible_on_reshape)
 {
 	mBorderThickness = getBorderWidth();
 
@@ -1218,6 +1226,8 @@ LLFlatListViewEx::LLFlatListViewEx(const Params& p)
 :	LLFlatListView(p)
 , mNoFilteredItemsMsg(p.no_filtered_items_msg)
 , mNoItemsMsg(p.no_items_msg)
+, mForceShowingUnmatchedItems(false)
+, mHasMatchedItems(false)
 {
 
 }
@@ -1242,6 +1252,16 @@ void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
 
 }
 
+bool LLFlatListViewEx::getForceShowingUnmatchedItems()
+{
+	return mForceShowingUnmatchedItems;
+}
+
+void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show)
+{
+	mForceShowingUnmatchedItems = show;
+}
+
 void LLFlatListViewEx::setFilterSubString(const std::string& filter_str)
 {
 	if (0 != LLStringUtil::compareInsensitive(filter_str, mFilterSubString))
@@ -1265,6 +1285,7 @@ void LLFlatListViewEx::filterItems()
 	item_panel_list_t items;
 	getItems(items);
 
+	mHasMatchedItems = false;
 	for (item_panel_list_t::iterator
 			 iter = items.begin(),
 			 iter_end = items.end();
@@ -1275,13 +1296,17 @@ void LLFlatListViewEx::filterItems()
 		// i.e. we don't hide items that don't support 'match_filter' action, separators etc.
 		if (0 == pItem->notify(action))
 		{
+			mHasMatchedItems = true;
 			pItem->setVisible(true);
 		}
 		else
 		{
 			// TODO: implement (re)storing of current selection.
-			selectItem(pItem, false);
-			pItem->setVisible(false);
+			if(!mForceShowingUnmatchedItems)
+			{
+				selectItem(pItem, false);
+			}
+			pItem->setVisible(mForceShowingUnmatchedItems);
 		}
 	}
 
@@ -1289,4 +1314,9 @@ void LLFlatListViewEx::filterItems()
 	notifyParentItemsRectChanged();
 }
 
+bool LLFlatListViewEx::hasMatchedItems()
+{
+	return mHasMatchedItems;
+}
+
 //EOF
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index f4e0426f15..ded46d8122 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -105,6 +105,9 @@ public:
 		/** don't allow to deselect all selected items (for mouse events on items only) */
 		Optional<bool> keep_one_selected;
 
+		/** try to keep selection visible after reshape */
+		Optional<bool> keep_selection_visible_on_reshape;
+
 		/** padding between items */
 		Optional<U32> item_pad; 
 
@@ -412,6 +415,8 @@ private:
 
 	bool mIsConsecutiveSelection;
 
+	bool mKeepSelectionVisibleOnReshape;
+
 	/** All pairs of the list */
 	pairs_list_t mItemPairs;
 
@@ -465,6 +470,10 @@ public:
 	void setNoItemsMsg(const std::string& msg) { mNoItemsMsg = msg; }
 	void setNoFilteredItemsMsg(const std::string& msg) { mNoFilteredItemsMsg = msg; }
 
+	bool getForceShowingUnmatchedItems();
+
+	void setForceShowingUnmatchedItems(bool show);
+
 	/**
 	 * Sets up new filter string and filters the list.
 	 */
@@ -476,6 +485,11 @@ public:
 	 */
 	void filterItems();
 
+	/**
+	 * Returns true if last call of filterItems() found at least one matching item
+	 */
+	bool hasMatchedItems();
+
 protected:
 	LLFlatListViewEx(const Params& p);
 
@@ -491,6 +505,14 @@ private:
 	std::string mNoFilteredItemsMsg;
 	std::string mNoItemsMsg;
 	std::string	mFilterSubString;
+	/**
+	 * Show list items that don't match current filter
+	 */
+	bool mForceShowingUnmatchedItems;
+	/**
+	 * True if last call of filterItems() found at least one matching item
+	 */
+	bool mHasMatchedItems;
 };
 
 #endif
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 9a56372e68..39a6855273 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2754,10 +2754,10 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
 
 LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build");
 
-bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
+bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node)
 {
 	Params params(LLUICtrlFactory::getDefaultParams<LLFloater>());
-	LLXUIParser::instance().readXUI(node, params); // *TODO: Error checking
+	LLXUIParser::instance().readXUI(node, params, filename); // *TODO: Error checking
 
 	if (output_node)
 	{
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 654164ddc0..3ea035777c 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -149,7 +149,7 @@ public:
 	static void setupParamsForExport(Params& p, LLView* parent);
 
 	void initFromParams(const LLFloater::Params& p);
-	bool initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
+	bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL);
 
 	/*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
 	/*virtual*/ BOOL canSnapTo(const LLView* other_view);
diff --git a/indra/llui/llloadingindicator.cpp b/indra/llui/llloadingindicator.cpp
index f8b029e19c..2ad5c5a530 100644
--- a/indra/llui/llloadingindicator.cpp
+++ b/indra/llui/llloadingindicator.cpp
@@ -41,7 +41,8 @@
 #include "lluictrlfactory.h"
 #include "lluiimage.h"
 
-static LLDefaultChildRegistry::Register<LLLoadingIndicator> r("loading_indicator");
+// registered in llui.cpp to avoid being left out by MS linker
+//static LLDefaultChildRegistry::Register<LLLoadingIndicator> r("loading_indicator");
 
 ///////////////////////////////////////////////////////////////////////////////
 // LLLoadingIndicator::Data class
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index b77126996e..b4a1bcb7c5 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -139,6 +139,7 @@ LLMenuItemGL::Params::Params()
 :	shortcut("shortcut"),
 	jump_key("jump_key", KEY_NONE),
 	use_mac_ctrl("use_mac_ctrl", false),
+	allow_key_repeat("allow_key_repeat", false),
 	rect("rect"),
 	left("left"),
 	top("top"),
@@ -160,7 +161,7 @@ LLMenuItemGL::Params::Params()
 LLMenuItemGL::LLMenuItemGL(const LLMenuItemGL::Params& p)
 :	LLUICtrl(p),
 	mJumpKey(p.jump_key),
-	mAllowKeyRepeat(FALSE),
+	mAllowKeyRepeat(p.allow_key_repeat),
 	mHighlight( FALSE ),
 	mGotHover( FALSE ),
 	mBriefItem( FALSE ),
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 6f0f83d4b9..7668f301ea 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -61,7 +61,8 @@ public:
 	{
 		Optional<std::string>	shortcut;
 		Optional<KEY>			jump_key;
-		Optional<bool>			use_mac_ctrl;
+		Optional<bool>			use_mac_ctrl,
+								allow_key_repeat;
 
 		Ignored					rect,
 								left,
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 27e59a0475..1773a1e86a 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -562,21 +562,6 @@ void LLNotification::setResponseFunctor(const LLNotificationResponderPtr& respon
 	mResponder = responder;
 }
 
-bool LLNotification::payloadContainsAll(const std::vector<std::string>& required_fields) const
-{
-	for(std::vector<std::string>::const_iterator required_fields_it = required_fields.begin(); 
-		required_fields_it != required_fields.end();
-		required_fields_it++)
-	{
-		std::string required_field_name = *required_fields_it;
-		if( ! getPayload().has(required_field_name))
-		{
-			return false; // a required field was not found
-		}
-	}
-	return true; // all required fields were found
-}
-
 bool LLNotification::isEquivalentTo(LLNotificationPtr that) const
 {
 	if (this->mTemplatep->mName != that->mTemplatep->mName) 
@@ -585,11 +570,22 @@ bool LLNotification::isEquivalentTo(LLNotificationPtr that) const
 	}
 	if (this->mTemplatep->mUnique)
 	{
+		const LLSD& these_substitutions = this->getSubstitutions();
+		const LLSD& those_substitutions = that->getSubstitutions();
+
 		// highlander bit sez there can only be one of these
-		return
-			this->payloadContainsAll(that->mTemplatep->mUniqueContext) &&
-			that->payloadContainsAll(this->mTemplatep->mUniqueContext);
+		for (std::vector<std::string>::const_iterator it = mTemplatep->mUniqueContext.begin(), end_it = mTemplatep->mUniqueContext.end();
+			it != end_it;
+			++it)
+		{
+			if (these_substitutions.get(*it).asString() != those_substitutions.get(*it).asString())
+			{
+				return false;
+			}
+		}
+		return true;
 	}
+
 	return false; 
 }
 
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 73357daaef..fd6f79d831 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -400,8 +400,6 @@ private:
 
 	void cancel();
 
-	bool payloadContainsAll(const std::vector<std::string>& required_fields) const;
-
 public:
 
 	// constructor from a saved notification
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 0cd052eefa..9ebdcb87c6 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -508,16 +508,19 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 		if (xml_filename.empty())
 		{
 			node->getAttributeString("filename", xml_filename);
+			setXMLFilename(xml_filename);
 		}
 
 		if (!xml_filename.empty())
 		{
+			LLUICtrlFactory::instance().pushFileName(xml_filename);
+
 			LLFastTimer timer(FTM_EXTERNAL_PANEL_LOAD);
 			if (output_node)
 			{
 				//if we are exporting, we want to export the current xml
 				//not the referenced xml
-				LLXUIParser::instance().readXUI(node, params, xml_filename);
+				LLXUIParser::instance().readXUI(node, params, LLUICtrlFactory::getInstance()->getCurFileName());
 				Params output_params(params);
 				setupParamsForExport(output_params, parent);
 				output_node->setName(node->getName()->mString);
@@ -533,13 +536,13 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 				return FALSE;
 			}
 
-			LLXUIParser::instance().readXUI(referenced_xml, params, xml_filename);
+			LLXUIParser::instance().readXUI(referenced_xml, params, LLUICtrlFactory::getInstance()->getCurFileName());
 
 			// add children using dimensions from referenced xml for consistent layout
 			setShape(params.rect);
 			LLUICtrlFactory::createChildren(this, referenced_xml, child_registry_t::instance());
 
-			setXMLFilename(xml_filename);
+			LLUICtrlFactory::instance().popFileName();
 		}
 
 		// ask LLUICtrlFactory for filename, since xml_filename might be empty
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index c0d02fa8e9..ac0c9c3e45 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -466,8 +466,3 @@ BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask)
 	return FALSE;
 }
 
-BOOL LLSpinCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
-{
-	// just treat a double click as a second click
-	return handleMouseDown(x, y, mask);
-}
diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h
index 06201255d2..00d6f86f83 100644
--- a/indra/llui/llspinctrl.h
+++ b/indra/llui/llspinctrl.h
@@ -94,7 +94,6 @@ public:
 
 	virtual BOOL	handleScrollWheel(S32 x,S32 y,S32 clicks);
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
 
 	void			onEditorCommit(const LLSD& data);
 	static void		onEditorGainFocus(LLFocusableElement* caller, void *userdata);
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 66c5af85c8..c72cdba263 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1,2845 +1,2839 @@
-/** 
- * @file lltextbase.cpp
- * @author Martin Reddy
- * @brief The base class of text box/editor, providing Url handling support
- *
- * $LicenseInfo:firstyear=2009&license=viewergpl$
- * 
- * Copyright (c) 2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lltextbase.h"
-
-#include "lllocalcliprect.h"
-#include "llmenugl.h"
-#include "llscrollcontainer.h"
-#include "llstl.h"
-#include "lltextparser.h"
-#include "lltooltip.h"
-#include "lluictrl.h"
-#include "llurlaction.h"
-#include "llurlregistry.h"
-#include "llview.h"
-#include "llwindow.h"
-#include <boost/bind.hpp>
-
-const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
-const S32	CURSOR_THICKNESS = 2;
-
-LLTextBase::line_info::line_info(S32 index_start, S32 index_end, LLRect rect, S32 line_num) 
-:	mDocIndexStart(index_start), 
-	mDocIndexEnd(index_end),
-	mRect(rect),
-	mLineNum(line_num)
-{}
-
-bool LLTextBase::compare_segment_end::operator()(const LLTextSegmentPtr& a, const LLTextSegmentPtr& b) const
-{
-	// sort empty spans (e.g. 11-11) after previous non-empty spans (e.g. 5-11)
-	if (a->getEnd() == b->getEnd())
-	{
-		return a->getStart() < b->getStart();
-	}
-	return a->getEnd() < b->getEnd();
-}
-
-
-// helper functors
-struct LLTextBase::compare_bottom
-{
-	bool operator()(const S32& a, const LLTextBase::line_info& b) const
-	{
-		return a > b.mRect.mBottom; // bottom of a is higher than bottom of b
-	}
-
-	bool operator()(const LLTextBase::line_info& a, const S32& b) const
-	{
-		return a.mRect.mBottom > b; // bottom of a is higher than bottom of b
-	}
-
-	bool operator()(const LLTextBase::line_info& a, const LLTextBase::line_info& b) const
-	{
-		return a.mRect.mBottom > b.mRect.mBottom; // bottom of a is higher than bottom of b
-	}
-
-};
-
-// helper functors
-struct LLTextBase::compare_top
-{
-	bool operator()(const S32& a, const LLTextBase::line_info& b) const
-	{
-		return a > b.mRect.mTop; // top of a is higher than top of b
-	}
-
-	bool operator()(const LLTextBase::line_info& a, const S32& b) const
-	{
-		return a.mRect.mTop > b; // top of a is higher than top of b
-	}
-
-	bool operator()(const LLTextBase::line_info& a, const LLTextBase::line_info& b) const
-	{
-		return a.mRect.mTop > b.mRect.mTop; // top of a is higher than top of b
-	}
-};
-
-struct LLTextBase::line_end_compare
-{
-	bool operator()(const S32& pos, const LLTextBase::line_info& info) const
-	{
-		return (pos < info.mDocIndexEnd);
-	}
-
-	bool operator()(const LLTextBase::line_info& info, const S32& pos) const
-	{
-		return (info.mDocIndexEnd < pos);
-	}
-
-	bool operator()(const LLTextBase::line_info& a, const LLTextBase::line_info& b) const
-	{
-		return (a.mDocIndexEnd < b.mDocIndexEnd);
-	}
-
-};
-
-//////////////////////////////////////////////////////////////////////////
-//
-// LLTextBase
-//
-
-// register LLTextBase::Params under name "textbase"
-static LLWidgetNameRegistry::StaticRegistrar sRegisterTextBaseParams(&typeid(LLTextBase::Params), "textbase");
-
-LLTextBase::LineSpacingParams::LineSpacingParams()
-:	multiple("multiple", 1.f),
-	pixels("pixels", 0)
-{
-}
-
-
-LLTextBase::Params::Params()
-:	cursor_color("cursor_color"),
-	text_color("text_color"),
-	text_readonly_color("text_readonly_color"),
-	bg_visible("bg_visible", false),
-	border_visible("border_visible", false),
-	bg_readonly_color("bg_readonly_color"),
-	bg_writeable_color("bg_writeable_color"),
-	bg_focus_color("bg_focus_color"),
-	allow_scroll("allow_scroll", true),
-	plain_text("plain_text",false),
-	track_end("track_end", false),
-	read_only("read_only", false),
-	v_pad("v_pad", 0),
-	h_pad("h_pad", 0),
-	clip_partial("clip_partial", true),
-	line_spacing("line_spacing"),
-	max_text_length("max_length", 255),
-	font_shadow("font_shadow"),
-	wrap("wrap"),
-	use_ellipses("use_ellipses", false),
-	allow_html("allow_html", false),
-	parse_highlights("parse_highlights", false)
-{
-	addSynonym(track_end, "track_bottom");
-	addSynonym(wrap, "word_wrap");
-}
-
-
-LLTextBase::LLTextBase(const LLTextBase::Params &p) 
-:	LLUICtrl(p, LLTextViewModelPtr(new LLTextViewModel)),
-	mURLClickSignal(),
-	mMaxTextByteLength( p.max_text_length ),
-	mDefaultFont(p.font),
-	mFontShadow(p.font_shadow),
-	mPopupMenu(NULL),
-	mReadOnly(p.read_only),
-	mCursorColor(p.cursor_color),
-	mFgColor(p.text_color),
-	mBorderVisible( p.border_visible ),
-	mReadOnlyFgColor(p.text_readonly_color),
-	mWriteableBgColor(p.bg_writeable_color),
-	mReadOnlyBgColor(p.bg_readonly_color),
-	mFocusBgColor(p.bg_focus_color),
-	mReflowIndex(S32_MAX),
-	mCursorPos( 0 ),
-	mScrollNeeded(FALSE),
-	mDesiredXPixel(-1),
-	mHPad(p.h_pad),
-	mVPad(p.v_pad),
-	mHAlign(p.font_halign),
-	mLineSpacingMult(p.line_spacing.multiple),
-	mLineSpacingPixels(p.line_spacing.pixels),
-	mClipPartial(p.clip_partial && !p.allow_scroll),
-	mTrackEnd( p.track_end ),
-	mScrollIndex(-1),
-	mSelectionStart( 0 ),
-	mSelectionEnd( 0 ),
-	mIsSelecting( FALSE ),
-	mPlainText ( p.plain_text ),
-	mWordWrap(p.wrap),
-	mUseEllipses( p.use_ellipses ),
-	mParseHTML(p.allow_html),
-	mParseHighlights(p.parse_highlights),
-	mBGVisible(p.bg_visible),
-	mScroller(NULL)
-{
-	if(p.allow_scroll)
-	{
-		LLScrollContainer::Params scroll_params;
-		scroll_params.name = "text scroller";
-		scroll_params.rect = getLocalRect();
-		scroll_params.follows.flags = FOLLOWS_ALL;
-		scroll_params.is_opaque = false;
-		scroll_params.mouse_opaque = false;
-		scroll_params.min_auto_scroll_rate = 200;
-		scroll_params.max_auto_scroll_rate = 800;
-		scroll_params.border_visible = p.border_visible;
-		mScroller = LLUICtrlFactory::create<LLScrollContainer>(scroll_params);
-		addChild(mScroller);
-	}
-
-	LLView::Params view_params;
-	view_params.name = "text_contents";
-	view_params.rect =  LLRect(0, 500, 500, 0);
-	view_params.mouse_opaque = false;
-
-	mDocumentView = LLUICtrlFactory::create<LLView>(view_params);
-	if (mScroller)
-	{
-		mScroller->addChild(mDocumentView);
-	}
-	else
-	{
-		addChild(mDocumentView);
-	}
-
-	createDefaultSegment();
-
-	updateRects();
-}
-
-LLTextBase::~LLTextBase()
-{
-	// Menu, like any other LLUICtrl, is deleted by its parent - gMenuHolder
-
-	mSegments.clear();
-}
-
-void LLTextBase::initFromParams(const LLTextBase::Params& p)
-{
-	LLUICtrl::initFromParams(p);
-	resetDirty();		// Update saved text state
-	updateSegments();
-
-	// HACK: work around enabled == readonly design bug -- RN
-	// setEnabled will modify our read only status, so do this after
-	// LLTextBase::initFromParams
-	if (p.read_only.isProvided())
-	{
-		mReadOnly = p.read_only;
-	}
-
-	// HACK:  text editors always need to be enabled so that we can scroll
-	LLView::setEnabled(true);
-}
-
-bool LLTextBase::truncate()
-{
-	BOOL did_truncate = FALSE;
-
-	// First rough check - if we're less than 1/4th the size, we're OK
-	if (getLength() >= S32(mMaxTextByteLength / 4))
-	{	
-		// Have to check actual byte size
-        LLWString text(getWText());
-		S32 utf8_byte_size = wstring_utf8_length(text);
-		if ( utf8_byte_size > mMaxTextByteLength )
-		{
-			// Truncate safely in UTF-8
-			std::string temp_utf8_text = wstring_to_utf8str(text);
-			temp_utf8_text = utf8str_truncate( temp_utf8_text, mMaxTextByteLength );
-			LLWString text = utf8str_to_wstring( temp_utf8_text );
-			// remove extra bit of current string, to preserve formatting, etc.
-			removeStringNoUndo(text.size(), getWText().size() - text.size());
-			did_truncate = TRUE;
-		}
-	}
-
-	return did_truncate;
-}
-
-LLStyle::Params LLTextBase::getDefaultStyleParams()
-{
-	return LLStyle::Params()
-		.color(LLUIColor(&mFgColor))
-		.readonly_color(LLUIColor(&mReadOnlyFgColor))
-		.font(mDefaultFont)
-		.drop_shadow(mFontShadow);
-}
-
-void LLTextBase::onValueChange(S32 start, S32 end)
-{
-}
-
-
-// Draws the black box behind the selected text
-void LLTextBase::drawSelectionBackground()
-{
-	// Draw selection even if we don't have keyboard focus for search/replace
-	if( hasSelection() && !mLineInfoList.empty())
-	{
-		std::vector<LLRect> selection_rects;
-
-		S32 selection_left		= llmin( mSelectionStart, mSelectionEnd );
-		S32 selection_right		= llmax( mSelectionStart, mSelectionEnd );
-		LLRect selection_rect = mVisibleTextRect;
-
-		// Skip through the lines we aren't drawing.
-		LLRect content_display_rect = getVisibleDocumentRect();
-
-		// binary search for line that starts before top of visible buffer
-		line_list_t::const_iterator line_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), content_display_rect.mTop, compare_bottom());
-		line_list_t::const_iterator end_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), content_display_rect.mBottom, compare_top());
-
-		bool done = false;
-
-		// Find the coordinates of the selected area
-		for (;line_iter != end_iter && !done; ++line_iter)
-		{
-			// is selection visible on this line?
-			if (line_iter->mDocIndexEnd > selection_left && line_iter->mDocIndexStart < selection_right)
-			{
-				segment_set_t::iterator segment_iter;
-				S32 segment_offset;
-				getSegmentAndOffset(line_iter->mDocIndexStart, &segment_iter, &segment_offset);
-				
-				LLRect selection_rect;
-				selection_rect.mLeft = line_iter->mRect.mLeft;
-				selection_rect.mRight = line_iter->mRect.mLeft;
-				selection_rect.mBottom = line_iter->mRect.mBottom;
-				selection_rect.mTop = line_iter->mRect.mTop;
-					
-				for(;segment_iter != mSegments.end(); ++segment_iter, segment_offset = 0)
-				{
-					LLTextSegmentPtr segmentp = *segment_iter;
-
-					S32 segment_line_start = segmentp->getStart() + segment_offset;
-					S32 segment_line_end = llmin(segmentp->getEnd(), line_iter->mDocIndexEnd);
-
-					if (segment_line_start > segment_line_end) break;
-
-					S32 segment_width = 0;
-					S32 segment_height = 0;
-
-					// if selection after beginning of segment
-					if(selection_left >= segment_line_start)
-					{
-						S32 num_chars = llmin(selection_left, segment_line_end) - segment_line_start;
-						segmentp->getDimensions(segment_offset, num_chars, segment_width, segment_height);
-						selection_rect.mLeft += segment_width;
-					}
-
-					// if selection_right == segment_line_end then that means we are the first character of the next segment
-					// or first character of the next line, in either case we want to add the length of the current segment
-					// to the selection rectangle and continue.
-					// if selection right > segment_line_end then selection spans end of current segment...
-					if (selection_right >= segment_line_end)
-					{
-						// extend selection slightly beyond end of line
-						// to indicate selection of newline character (use "n" character to determine width)
-						S32 num_chars = segment_line_end - segment_line_start;
-						segmentp->getDimensions(segment_offset, num_chars, segment_width, segment_height);
-						selection_rect.mRight += segment_width;
-					}
-					// else if selection ends on current segment...
-					else
-					{
-						S32 num_chars = selection_right - segment_line_start;
-						segmentp->getDimensions(segment_offset, num_chars, segment_width, segment_height);
-						selection_rect.mRight += segment_width;
-
-						break;
-					}
-				}
-				selection_rects.push_back(selection_rect);
-			}
-		}
-		
-		// Draw the selection box (we're using a box instead of reversing the colors on the selected text).
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		const LLColor4& color = mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get();
-		F32 alpha = hasFocus() ? 0.7f : 0.3f;
-		alpha *= getDrawContext().mAlpha;
-		LLColor4 selection_color(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE], alpha);
-
-		for (std::vector<LLRect>::iterator rect_it = selection_rects.begin();
-			rect_it != selection_rects.end();
-			++rect_it)
-		{
-			LLRect selection_rect = *rect_it;
-			selection_rect.translate(mVisibleTextRect.mLeft - content_display_rect.mLeft, mVisibleTextRect.mBottom - content_display_rect.mBottom);
-			gl_rect_2d(selection_rect, selection_color);
-		}
-	}
-}
-
-void LLTextBase::drawCursor()
-{
-	F32 alpha = getDrawContext().mAlpha;
-
-	if( hasFocus()
-		&& gFocusMgr.getAppHasFocus()
-		&& !mReadOnly)
-	{
-		const LLWString &wtext = getWText();
-		const llwchar* text = wtext.c_str();
-
-		LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);
-		cursor_rect.translate(-1, 0);
-		segment_set_t::iterator seg_it = getSegIterContaining(mCursorPos);
-
-		// take style from last segment
-		LLTextSegmentPtr segmentp;
-
-		if (seg_it != mSegments.end())
-		{
-			segmentp = *seg_it;
-		}
-		else
-		{
-			//segmentp = mSegments.back();
-			return;
-		}
-
-		// Draw the cursor
-		// (Flash the cursor every half second starting a fixed time after the last keystroke)
-		F32 elapsed = mCursorBlinkTimer.getElapsedTimeF32();
-		if( (elapsed < CURSOR_FLASH_DELAY ) || (S32(elapsed * 2) & 1) )
-		{
-
-			if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())
-			{
-				S32 segment_width = 0;
-				S32 segment_height = 0;
-				segmentp->getDimensions(mCursorPos - segmentp->getStart(), 1, segment_width, segment_height);
-				S32 width = llmax(CURSOR_THICKNESS, segment_width);
-				cursor_rect.mRight = cursor_rect.mLeft + width;
-			}
-			else
-			{
-				cursor_rect.mRight = cursor_rect.mLeft + CURSOR_THICKNESS;
-			}
-			
-			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-
-			LLColor4 cursor_color = mCursorColor.get() % alpha;
-			gGL.color4fv( cursor_color.mV );
-			
-			gl_rect_2d(cursor_rect);
-
-			if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection() && text[mCursorPos] != '\n')
-			{
-				LLColor4 text_color;
-				const LLFontGL* fontp;
-				if (segmentp)
-				{
-					text_color = segmentp->getColor();
-					fontp = segmentp->getStyle()->getFont();
-				}
-				else if (mReadOnly)
-				{
-					text_color = mReadOnlyFgColor.get();
-					fontp = mDefaultFont;
-				}
-				else
-				{
-					text_color = mFgColor.get();
-					fontp = mDefaultFont;
-				}
-				fontp->render(text, mCursorPos, cursor_rect.mLeft, cursor_rect.mTop, 
-					LLColor4(1.f - text_color.mV[VRED], 1.f - text_color.mV[VGREEN], 1.f - text_color.mV[VBLUE], alpha),
-					LLFontGL::LEFT, LLFontGL::TOP,
-					LLFontGL::NORMAL,
-					LLFontGL::NO_SHADOW,
-					1);
-			}
-
-			// Make sure the IME is in the right place
-			LLRect screen_pos = calcScreenRect();
-			LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_rect.mLeft), screen_pos.mBottom + llfloor(cursor_rect.mTop) );
-
-			ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);
-			ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]);
-			getWindow()->setLanguageTextInput( ime_pos );
-		}
-	}
-}
-
-void LLTextBase::drawText()
-{
-	const S32 text_len = getLength();
-	if( text_len <= 0 )
-	{
-		return;
-	}
-	S32 selection_left = -1;
-	S32 selection_right = -1;
-	// Draw selection even if we don't have keyboard focus for search/replace
-	if( hasSelection())
-	{
-		selection_left = llmin( mSelectionStart, mSelectionEnd );
-		selection_right = llmax( mSelectionStart, mSelectionEnd );
-	}
-
-	LLRect scrolled_view_rect = getVisibleDocumentRect();
-	std::pair<S32, S32> line_range = getVisibleLines(mClipPartial);
-	S32 first_line = line_range.first;
-	S32 last_line = line_range.second;
-	if (first_line >= last_line)
-	{
-		return;
-	}
-	
-	S32 line_start = getLineStart(first_line);
-	// find first text segment that spans top of visible portion of text buffer
-	segment_set_t::iterator seg_iter = getSegIterContaining(line_start);
-	if (seg_iter == mSegments.end()) 
-	{
-		return;
-	}
-
-	LLTextSegmentPtr cur_segment = *seg_iter;
-
-	for (S32 cur_line = first_line; cur_line < last_line; cur_line++)
-	{
-		S32 next_line = cur_line + 1;
-		line_info& line = mLineInfoList[cur_line];
-
-		S32 next_start = -1;
-		S32 line_end = text_len;
-
-		if (next_line < getLineCount())
-		{
-			next_start = getLineStart(next_line);
-			line_end = next_start;
-		}
-
-		LLRect text_rect(line.mRect.mLeft + mVisibleTextRect.mLeft - scrolled_view_rect.mLeft,
-						line.mRect.mTop - scrolled_view_rect.mBottom + mVisibleTextRect.mBottom,
-						llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft,
-						line.mRect.mBottom - scrolled_view_rect.mBottom + mVisibleTextRect.mBottom);
-
-		// draw a single line of text
-		S32 seg_start = line_start;
-		while( seg_start < line_end )
-		{
-			while( cur_segment->getEnd() <= seg_start )
-			{
-				seg_iter++;
-				if (seg_iter == mSegments.end())
-				{
-					llwarns << "Ran off the segmentation end!" << llendl;
-
-					return;
-				}
-				cur_segment = *seg_iter;
-			}
-			
-			S32 clipped_end	=	llmin( line_end, cur_segment->getEnd() )  - cur_segment->getStart();
-
-			if (mUseEllipses								// using ellipses
-				&& clipped_end == line_end					// last segment on line
-				&& next_line == last_line					// this is the last visible line
-				&& last_line < (S32)mLineInfoList.size())	// and there is more text to display
-			{
-				// more lines of text to go, but we can't fit them
-				// so shrink text rect to force ellipses
-				text_rect.mRight -= 2;
-			}
-
-			text_rect.mLeft = (S32)(cur_segment->draw(seg_start - cur_segment->getStart(), clipped_end, selection_left, selection_right, text_rect));
-
-			seg_start = clipped_end + cur_segment->getStart();
-		}
-
-		line_start = next_start;
-	}
-}
-
-///////////////////////////////////////////////////////////////////
-// Returns change in number of characters in mWText
-
-S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::segment_vec_t* segments )
-{
-	LLWString text(getWText());
-	S32 old_len = text.length();		// length() returns character length
-	S32 insert_len = wstr.length();
-
-	pos = getEditableIndex(pos, true);
-
-	segment_set_t::iterator seg_iter = getSegIterContaining(pos);
-
-	LLTextSegmentPtr default_segment;
-
-	LLTextSegmentPtr segmentp;
-	if (seg_iter != mSegments.end())
-	{
-		segmentp = *seg_iter;
-	}
-	else
-	{
-		//segmentp = mSegments.back();
-		return pos;
-	}
-
-	if (segmentp->canEdit())
-	{
-		segmentp->setEnd(segmentp->getEnd() + insert_len);
-		if (seg_iter != mSegments.end())
-		{
-			++seg_iter;
-		}
-	}
-	else
-	{
-		// create default editable segment to hold new text
-		LLStyleConstSP sp(new LLStyle(getDefaultStyleParams()));
-		default_segment = new LLNormalTextSegment( sp, pos, pos + insert_len, *this);
-	}
-
-	// shift remaining segments to right
-	for(;seg_iter != mSegments.end(); ++seg_iter)
-	{
-		LLTextSegmentPtr segmentp = *seg_iter;
-		segmentp->setStart(segmentp->getStart() + insert_len);
-		segmentp->setEnd(segmentp->getEnd() + insert_len);
-	}
-
-	// insert new segments
-	if (segments)
-	{
-		if (default_segment.notNull())
-		{
-			// potentially overwritten by segments passed in
-			insertSegment(default_segment);
-		}
-		for (segment_vec_t::iterator seg_iter = segments->begin();
-			seg_iter != segments->end();
-			++seg_iter)
-		{
-			LLTextSegment* segmentp = *seg_iter;
-			insertSegment(segmentp);
-		}
-	}
-
-	text.insert(pos, wstr);
-    getViewModel()->setDisplay(text);
-
-	if ( truncate() )
-	{
-		insert_len = getLength() - old_len;
-	}
-
-	onValueChange(pos, pos + insert_len);
-	needsReflow(pos);
-
-	return insert_len;
-}
-
-S32 LLTextBase::removeStringNoUndo(S32 pos, S32 length)
-{
-    LLWString text(getWText());
-	segment_set_t::iterator seg_iter = getSegIterContaining(pos);
-	while(seg_iter != mSegments.end())
-	{
-		LLTextSegmentPtr segmentp = *seg_iter;
-		S32 end = pos + length;
-		if (segmentp->getStart() < pos)
-		{
-			// deleting from middle of segment
-			if (segmentp->getEnd() > end)
-			{
-				segmentp->setEnd(segmentp->getEnd() - length);
-			}
-			// truncating segment
-			else
-			{
-				segmentp->setEnd(pos);
-			}
-		}
-		else if (segmentp->getStart() < end)
-		{
-			// deleting entire segment
-			if (segmentp->getEnd() <= end)
-			{
-				// remove segment
-				segmentp->unlinkFromDocument(this);
-				segment_set_t::iterator seg_to_erase(seg_iter++);
-				mSegments.erase(seg_to_erase);
-				continue;
-			}
-			// deleting head of segment
-			else
-			{
-				segmentp->setStart(pos);
-				segmentp->setEnd(segmentp->getEnd() - length);
-			}
-		}
-		else
-		{
-			// shifting segments backward to fill deleted portion
-			segmentp->setStart(segmentp->getStart() - length);
-			segmentp->setEnd(segmentp->getEnd() - length);
-		}
-		++seg_iter;
-	}
-
-	text.erase(pos, length);
-    getViewModel()->setDisplay(text);
-
-	// recreate default segment in case we erased everything
-	createDefaultSegment();
-
-	onValueChange(pos, pos);
-	needsReflow(pos);
-
-	return -length;	// This will be wrong if someone calls removeStringNoUndo with an excessive length
-}
-
-S32 LLTextBase::overwriteCharNoUndo(S32 pos, llwchar wc)
-{
-	if (pos > (S32)getLength())
-	{
-		return 0;
-	}
-    LLWString text(getWText());
-	text[pos] = wc;
-    getViewModel()->setDisplay(text);
-
-	onValueChange(pos, pos + 1);
-	needsReflow(pos);
-
-	return 1;
-}
-
-
-void LLTextBase::createDefaultSegment()
-{
-	// ensures that there is always at least one segment
-	if (mSegments.empty())
-	{
-		LLStyleConstSP sp(new LLStyle(getDefaultStyleParams()));
-		LLTextSegmentPtr default_segment = new LLNormalTextSegment( sp, 0, getLength() + 1, *this);
-		mSegments.insert(default_segment);
-		default_segment->linkToDocument(this);
-	}
-}
-
-void LLTextBase::insertSegment(LLTextSegmentPtr segment_to_insert)
-{
-	if (segment_to_insert.isNull()) 
-	{
-		return;
-	}
-
-	segment_set_t::iterator cur_seg_iter = getSegIterContaining(segment_to_insert->getStart());
-	S32 reflow_start_index = 0;
-
-	if (cur_seg_iter == mSegments.end())
-	{
-		mSegments.insert(segment_to_insert);
-		segment_to_insert->linkToDocument(this);
-		reflow_start_index = segment_to_insert->getStart();
-	}
-	else
-	{
-		LLTextSegmentPtr cur_segmentp = *cur_seg_iter;
-		reflow_start_index = cur_segmentp->getStart();
-		if (cur_segmentp->getStart() < segment_to_insert->getStart())
-		{
-			S32 old_segment_end = cur_segmentp->getEnd();
-			// split old at start point for new segment
-			cur_segmentp->setEnd(segment_to_insert->getStart());
-			// advance to next segment
-			// insert remainder of old segment
-			LLStyleConstSP sp = cur_segmentp->getStyle();
-			LLTextSegmentPtr remainder_segment = new LLNormalTextSegment( sp, segment_to_insert->getStart(), old_segment_end, *this);
-			mSegments.insert(cur_seg_iter, remainder_segment);
-			remainder_segment->linkToDocument(this);
-			// insert new segment before remainder of old segment
-			mSegments.insert(cur_seg_iter, segment_to_insert);
-
-			segment_to_insert->linkToDocument(this);
-			// at this point, there will be two overlapping segments owning the text
-			// associated with the incoming segment
-		}
-		else
-		{
-			mSegments.insert(cur_seg_iter, segment_to_insert);
-			segment_to_insert->linkToDocument(this);
-		}
-
-		// now delete/truncate remaining segments as necessary
-		// cur_seg_iter points to segment before incoming segment
-		while(cur_seg_iter != mSegments.end())
-		{
-			cur_segmentp = *cur_seg_iter;
-			if (cur_segmentp == segment_to_insert) 
-			{
-				++cur_seg_iter;
-				continue;
-			}
-
-			if (cur_segmentp->getStart() >= segment_to_insert->getStart())
-			{
-				if(cur_segmentp->getEnd() <= segment_to_insert->getEnd())
-				{
-					cur_segmentp->unlinkFromDocument(this);
-					// grab copy of iterator to erase, and bump it
-					segment_set_t::iterator seg_to_erase(cur_seg_iter++);
-					mSegments.erase(seg_to_erase);
-					continue;
-				}
-				else
-				{
-					// last overlapping segment, clip to end of incoming segment
-					// and stop traversal
-					cur_segmentp->setStart(segment_to_insert->getEnd());
-					break;
-				}
-			}
-			++cur_seg_iter;
-		}
-	}
-
-	// layout potentially changed
-	needsReflow(reflow_start_index);
-}
-
-BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleMouseDown(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleMouseDown(x, y, mask);
-}
-
-BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleMouseUp(x, y, mask))
-	{
-		// Did we just click on a link?
-		if (cur_segment->getStyle()
-		    && cur_segment->getStyle()->isLink())
-		{
-			// *TODO: send URL here?
-			mURLClickSignal(this, LLSD() );
-		}
-		return TRUE;
-	}
-
-	return LLUICtrl::handleMouseUp(x, y, mask);
-}
-
-BOOL LLTextBase::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleMiddleMouseDown(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleMiddleMouseDown(x, y, mask);
-}
-
-BOOL LLTextBase::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleMiddleMouseUp(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleMiddleMouseUp(x, y, mask);
-}
-
-BOOL LLTextBase::handleRightMouseDown(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleRightMouseDown(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleRightMouseDown(x, y, mask);
-}
-
-BOOL LLTextBase::handleRightMouseUp(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleRightMouseUp(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleRightMouseUp(x, y, mask);
-}
-
-BOOL LLTextBase::handleDoubleClick(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleDoubleClick(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleDoubleClick(x, y, mask);
-}
-
-BOOL LLTextBase::handleHover(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleHover(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleHover(x, y, mask);
-}
-
-BOOL LLTextBase::handleScrollWheel(S32 x, S32 y, S32 clicks)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleScrollWheel(x, y, clicks))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleScrollWheel(x, y, clicks);
-}
-
-BOOL LLTextBase::handleToolTip(S32 x, S32 y, MASK mask)
-{
-	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	if (cur_segment && cur_segment->handleToolTip(x, y, mask))
-	{
-		return TRUE;
-	}
-
-	return LLUICtrl::handleToolTip(x, y, mask);
-}
-
-
-void LLTextBase::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
-	if (width != getRect().getWidth() || height != getRect().getHeight())
-	{
-		bool scrolled_to_bottom = mScroller ? mScroller->isAtBottom() : false;
-		
-		LLUICtrl::reshape( width, height, called_from_parent );
-	
-		if (mScroller && scrolled_to_bottom && mTrackEnd)
-		{
-			// keep bottom of text buffer visible
-			// do this here as well as in reflow to handle case
-			// where shrinking from top, which causes buffer to temporarily 
-			// not be scrolled to the bottom, since the scroll index
-			// specified the _top_ of the visible document region
-			mScroller->goToBottom();
-		}		
-
-		// do this first after reshape, because other things depend on
-		// up-to-date mVisibleTextRect
-		updateRects();
-		
-		needsReflow();
-	}
-}
-
-void LLTextBase::draw()
-{
-	// reflow if needed, on demand
-	reflow();
-
-	// then update scroll position, as cursor may have moved
-	if (!mReadOnly)
-	{
-		updateScrollFromCursor();
-	}
-
-	LLRect doc_rect;
-	if (mScroller)
-	{
-		mScroller->localRectToOtherView(mScroller->getContentWindowRect(), &doc_rect, this);
-	}
-	else
-	{
-		doc_rect = getLocalRect();
-	}
-
-	if (mBGVisible)
-	{
-		// clip background rect against extents, if we support scrolling
-		LLLocalClipRect clip(doc_rect, mScroller != NULL);
-
-		LLColor4 bg_color = mReadOnly 
-							? mReadOnlyBgColor.get()
-							: hasFocus() 
-								? mFocusBgColor.get() 
-								: mWriteableBgColor.get();
-		gl_rect_2d(mVisibleTextRect, bg_color, TRUE);
-	}
-
-	// draw document view
-	LLUICtrl::draw();
-
-	{
-		// only clip if we support scrolling (mScroller != NULL)
-		LLLocalClipRect clip(doc_rect, mScroller != NULL);
-		drawSelectionBackground();
-		drawText();
-		drawCursor();
-	}
-}
-
-
-//virtual
-void LLTextBase::setColor( const LLColor4& c )
-{
-	mFgColor = c;
-}
-
-//virtual 
-void LLTextBase::setReadOnlyColor(const LLColor4 &c)
-{
-	mReadOnlyFgColor = c;
-}
-
-//virtual
-void LLTextBase::handleVisibilityChange( BOOL new_visibility )
-{
-	if(!new_visibility && mPopupMenu)
-	{
-		mPopupMenu->hide();
-	}
-	LLUICtrl::handleVisibilityChange(new_visibility);
-}
-
-//virtual
-void LLTextBase::setValue(const LLSD& value )
-{
-	setText(value.asString());
-}
-
-//virtual
-BOOL LLTextBase::canDeselect() const 
-{ 
-	return hasSelection(); 
-}
-
-
-//virtual
-void LLTextBase::deselect()
-{
-	mSelectionStart = 0;
-	mSelectionEnd = 0;
-	mIsSelecting = FALSE;
-}
-
-
-// Sets the scrollbar from the cursor position
-void LLTextBase::updateScrollFromCursor()
-{
-	// Update scroll position even in read-only mode (when there's no cursor displayed)
-	// because startOfDoc()/endOfDoc() modify cursor position. See EXT-736.
-
-	if (!mScrollNeeded || !mScroller)
-	{
-		return;
-	}
-	mScrollNeeded = FALSE; 
-
-	// scroll so that the cursor is at the top of the page
-	LLRect scroller_doc_window = getVisibleDocumentRect();
-	LLRect cursor_rect_doc = getLocalRectFromDocIndex(mCursorPos);
-	cursor_rect_doc.translate(scroller_doc_window.mLeft, scroller_doc_window.mBottom);
-	mScroller->scrollToShowRect(cursor_rect_doc, LLRect(0, scroller_doc_window.getHeight() - 5, scroller_doc_window.getWidth(), 5));
-}
-
-S32 LLTextBase::getLeftOffset(S32 width)
-{
-	switch (mHAlign)
-	{
-	case LLFontGL::LEFT:
-		return mHPad;
-	case LLFontGL::HCENTER:
-		return mHPad + llmax(0, (mVisibleTextRect.getWidth() - width - mHPad) / 2);
-	case LLFontGL::RIGHT:
-		return mVisibleTextRect.getWidth() - width;
-	default:
-		return mHPad;
-	}
-}
-
-
-static LLFastTimer::DeclareTimer FTM_TEXT_REFLOW ("Text Reflow");
-void LLTextBase::reflow()
-{
-	LLFastTimer ft(FTM_TEXT_REFLOW);
-
-	updateSegments();
-
-	if (mReflowIndex == S32_MAX)
-	{
-		return;
-	}
-
-	bool scrolled_to_bottom = mScroller ? mScroller->isAtBottom() : false;
-
-	LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);
-	bool follow_selection = getLocalRect().overlaps(cursor_rect); // cursor is (potentially) visible
-
-	// store in top-left relative coordinates to avoid issues with horizontal scrollbar appearing and disappearing
-	cursor_rect.mTop = mVisibleTextRect.mTop - cursor_rect.mTop;
-	cursor_rect.mBottom = mVisibleTextRect.mTop - cursor_rect.mBottom;
-
-	S32 first_line = getFirstVisibleLine();
-
-	// if scroll anchor not on first line, update it to first character of first line
-	if (!mLineInfoList.empty()
-		&&	(mScrollIndex <  mLineInfoList[first_line].mDocIndexStart
-			||	mScrollIndex >= mLineInfoList[first_line].mDocIndexEnd))
-	{
-		mScrollIndex = mLineInfoList[first_line].mDocIndexStart;
-	}
-	LLRect first_char_rect = getLocalRectFromDocIndex(mScrollIndex);
-	// store in top-left relative coordinates to avoid issues with horizontal scrollbar appearing and disappearing
-	first_char_rect.mTop = mVisibleTextRect.mTop - first_char_rect.mTop;
-	first_char_rect.mBottom = mVisibleTextRect.mTop - first_char_rect.mBottom;
-
-	S32 reflow_count = 0;
-	while(mReflowIndex < S32_MAX)
-	{
-		// we can get into an infinite loop if the document height does not monotonically increase
-		// with decreasing width (embedded ui elements with alternate layouts).  In that case, 
-		// we want to stop reflowing after 2 iterations.  We use 2, since we need to handle the case
-		// of introducing a vertical scrollbar causing a reflow with less width.  We should also always
-		// use an even number of iterations to avoid user visible oscillation of the layout
-		if(++reflow_count > 2)
-		{
-			lldebugs << "Breaking out of reflow due to possible infinite loop in " << getName() << llendl;
-			break;
-		}
-	
-		S32 start_index = mReflowIndex;
-		mReflowIndex = S32_MAX;
-
-		// shrink document to minimum size (visible portion of text widget)
-		// to force inlined widgets with follows set to shrink
-		mDocumentView->reshape(mVisibleTextRect.getWidth(), mDocumentView->getRect().getHeight());
-
-		S32 cur_top = 0;
-
-		segment_set_t::iterator seg_iter = mSegments.begin();
-		S32 seg_offset = 0;
-		S32 line_start_index = 0;
-		const S32 text_available_width = mVisibleTextRect.getWidth() - mHPad;  // reserve room for margin
-		S32 remaining_pixels = text_available_width;
-		S32 line_count = 0;
-
-		// find and erase line info structs starting at start_index and going to end of document
-		if (!mLineInfoList.empty())
-		{
-			// find first element whose end comes after start_index
-			line_list_t::iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), start_index, line_end_compare());
-			line_start_index = iter->mDocIndexStart;
-			line_count = iter->mLineNum;
-			cur_top = iter->mRect.mTop;
-			getSegmentAndOffset(iter->mDocIndexStart, &seg_iter, &seg_offset);
-			mLineInfoList.erase(iter, mLineInfoList.end());
-		}
-
-		S32 line_height = 0;
-
-		while(seg_iter != mSegments.end())
-		{
-			LLTextSegmentPtr segment = *seg_iter;
-
-			// track maximum height of any segment on this line
-			S32 cur_index = segment->getStart() + seg_offset;
-
-			// ask segment how many character fit in remaining space
-			S32 character_count = segment->getNumChars(getWordWrap() ? llmax(0, remaining_pixels) : S32_MAX,
-														seg_offset, 
-														cur_index - line_start_index, 
-														S32_MAX);
-
-			S32 segment_width, segment_height;
-			bool force_newline = segment->getDimensions(seg_offset, character_count, segment_width, segment_height);
-			// grow line height as necessary based on reported height of this segment
-			line_height = llmax(line_height, segment_height);
-			remaining_pixels -= segment_width;
-
-			seg_offset += character_count;
-
-			S32 last_segment_char_on_line = segment->getStart() + seg_offset;
-
-			S32 text_actual_width = text_available_width - remaining_pixels;
-			S32 text_left = getLeftOffset(text_actual_width);
-			LLRect line_rect(text_left, 
-							cur_top, 
-							text_left + text_actual_width, 
-							cur_top - line_height);
-
-			// if we didn't finish the current segment...
-			if (last_segment_char_on_line < segment->getEnd())
-			{
-				// add line info and keep going
-				mLineInfoList.push_back(line_info(
-											line_start_index, 
-											last_segment_char_on_line, 
-											line_rect, 
-											line_count));
-
-				line_start_index = segment->getStart() + seg_offset;
-				cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels;
-				remaining_pixels = text_available_width;
-				line_height = 0;
-			}
-			// ...just consumed last segment..
-			else if (++segment_set_t::iterator(seg_iter) == mSegments.end())
-			{
-				mLineInfoList.push_back(line_info(
-											line_start_index, 
-											last_segment_char_on_line, 
-											line_rect, 
-											line_count));
-				cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels;
-				break;
-			}
-			// ...or finished a segment and there are segments remaining on this line
-			else
-			{
-				// subtract pixels used and increment segment
-				if (force_newline)
-				{
-					mLineInfoList.push_back(line_info(
-												line_start_index, 
-												last_segment_char_on_line, 
-												line_rect, 
-												line_count));
-					line_start_index = segment->getStart() + seg_offset;
-					cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels;
-					line_height = 0;
-					remaining_pixels = text_available_width;
-				}
-				++seg_iter;
-				seg_offset = 0;
-			}
-			if (force_newline) 
-			{
-				line_count++;
-			}
-		}
-
-		// calculate visible region for diplaying text
-		updateRects();
-
-		for (segment_set_t::iterator segment_it = mSegments.begin();
-			segment_it != mSegments.end();
-			++segment_it)
-		{
-			LLTextSegmentPtr segmentp = *segment_it;
-			segmentp->updateLayout(*this);
-
-		}
-	}
-
-		// apply scroll constraints after reflowing text
-		if (!hasMouseCapture() && mScroller)
-		{
-			if (scrolled_to_bottom && mTrackEnd)
-			{
-				// keep bottom of text buffer visible
-				endOfDoc();
-			}
-			else if (hasSelection() && follow_selection)
-			{
-				// keep cursor in same vertical position on screen when selecting text
-				LLRect new_cursor_rect_doc = getDocRectFromDocIndex(mCursorPos);
-			LLRect old_cursor_rect = cursor_rect;
-			old_cursor_rect.mTop = mVisibleTextRect.mTop - cursor_rect.mTop;
-			old_cursor_rect.mBottom = mVisibleTextRect.mTop - cursor_rect.mBottom;
-
-				mScroller->scrollToShowRect(new_cursor_rect_doc, old_cursor_rect);
-			}
-			else
-			{
-				// keep first line of text visible
-				LLRect new_first_char_rect = getDocRectFromDocIndex(mScrollIndex);
-
-			// pass in desired rect in the coordinate frame of the document viewport
-			LLRect old_first_char_rect = first_char_rect;
-			old_first_char_rect.mTop = mVisibleTextRect.mTop - first_char_rect.mTop;
-			old_first_char_rect.mBottom = mVisibleTextRect.mTop - first_char_rect.mBottom;
-
-			mScroller->scrollToShowRect(new_first_char_rect, old_first_char_rect);
-			}
-		}
-
-		// reset desired x cursor position
-		updateCursorXPos();
-	}
-
-LLRect LLTextBase::getTextBoundingRect()
-{
-	reflow();
-	return mTextBoundingRect;
-}
-
-
-void LLTextBase::clearSegments()
-{
-	mSegments.clear();
-	createDefaultSegment();
-}
-
-S32 LLTextBase::getLineStart( S32 line ) const
-{
-	S32 num_lines = getLineCount();
-	if (num_lines == 0)
-    {
-		return 0;
-    }
-
-	line = llclamp(line, 0, num_lines-1);
-	return mLineInfoList[line].mDocIndexStart;
-}
-
-S32 LLTextBase::getLineEnd( S32 line ) const
-{
-	S32 num_lines = getLineCount();
-	if (num_lines == 0)
-    {
-		return 0;
-    }
-
-	line = llclamp(line, 0, num_lines-1);
-	return mLineInfoList[line].mDocIndexEnd;
-}
-
-
-
-S32 LLTextBase::getLineNumFromDocIndex( S32 doc_index, bool include_wordwrap) const
-{
-	if (mLineInfoList.empty())
-	{
-		return 0;
-	}
-	else
-	{
-		line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), doc_index, line_end_compare());
-		if (include_wordwrap)
-		{
-			return iter - mLineInfoList.begin();
-		}
-		else
-		{
-			if (iter == mLineInfoList.end())
-			{
-				return mLineInfoList.back().mLineNum;
-			}
-			else
-			{
-				return iter->mLineNum;
-			}
-		}
-	}
-}
-
-// Given an offset into text (pos), find the corresponding line (from the start of the doc) and an offset into the line.
-S32 LLTextBase::getLineOffsetFromDocIndex( S32 startpos, bool include_wordwrap) const
-{
-	if (mLineInfoList.empty())
-	{
-		return startpos;
-	}
-	else
-	{
-		line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), startpos, line_end_compare());
-		return startpos - iter->mDocIndexStart;
-	}
-}
-
-S32	LLTextBase::getFirstVisibleLine() const
-{
-	LLRect visible_region = getVisibleDocumentRect();
-
-	// binary search for line that starts before top of visible buffer
-	line_list_t::const_iterator iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_bottom());
-
-	return iter - mLineInfoList.begin();
-}
-
-std::pair<S32, S32>	LLTextBase::getVisibleLines(bool fully_visible) 
-{
-	LLRect visible_region = getVisibleDocumentRect();
-	line_list_t::const_iterator first_iter;
-	line_list_t::const_iterator last_iter;
-
-	// make sure we have an up-to-date mLineInfoList
-	reflow();
-
-	if (fully_visible)
-	{
-		first_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_top());
-		last_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mBottom, compare_bottom());
-	}
-	else
-	{
-		first_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_bottom());
-		last_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mBottom, compare_top());
-	}
-	return std::pair<S32, S32>(first_iter - mLineInfoList.begin(), last_iter - mLineInfoList.begin());
-}
-
-
-
-LLTextViewModel* LLTextBase::getViewModel() const
-{
-	return (LLTextViewModel*)mViewModel.get();
-}
-
-void LLTextBase::addDocumentChild(LLView* view) 
-{ 
-	mDocumentView->addChild(view); 
-}
-
-void LLTextBase::removeDocumentChild(LLView* view) 
-{ 
-	mDocumentView->removeChild(view); 
-}
-
-
-static LLFastTimer::DeclareTimer FTM_UPDATE_TEXT_SEGMENTS("Update Text Segments");
-void LLTextBase::updateSegments()
-{
-	LLFastTimer ft(FTM_UPDATE_TEXT_SEGMENTS);
-	createDefaultSegment();
-}
-
-void LLTextBase::getSegmentAndOffset( S32 startpos, segment_set_t::const_iterator* seg_iter, S32* offsetp ) const
-{
-	*seg_iter = getSegIterContaining(startpos);
-	if (*seg_iter == mSegments.end())
-	{
-		*offsetp = 0;
-	}
-	else
-	{
-		*offsetp = startpos - (**seg_iter)->getStart();
-	}
-}
-
-void LLTextBase::getSegmentAndOffset( S32 startpos, segment_set_t::iterator* seg_iter, S32* offsetp )
-{
-	*seg_iter = getSegIterContaining(startpos);
-	if (*seg_iter == mSegments.end())
-	{
-		*offsetp = 0;
-	}
-	else
-	{
-		*offsetp = startpos - (**seg_iter)->getStart();
-	}
-}
-
-LLTextBase::segment_set_t::iterator LLTextBase::getSegIterContaining(S32 index)
-{
-	segment_set_t::iterator it = mSegments.upper_bound(new LLIndexSegment(index));
-	return it;
-}
-
-LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 index) const
-{
-	LLTextBase::segment_set_t::const_iterator it =  mSegments.upper_bound(new LLIndexSegment(index));
-	return it;
-}
-
-// Finds the text segment (if any) at the give local screen position
-LLTextSegmentPtr LLTextBase::getSegmentAtLocalPos( S32 x, S32 y, bool hit_past_end_of_line)
-{
-	// Find the cursor position at the requested local screen position
-	S32 offset = getDocIndexFromLocalCoord( x, y, FALSE, hit_past_end_of_line);
-	segment_set_t::iterator seg_iter = getSegIterContaining(offset);
-	if (seg_iter != mSegments.end())
-	{
-		return *seg_iter;
-	}
-	else
-	{
-		return LLTextSegmentPtr();
-	}
-}
-
-void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url)
-{
-	// work out the XUI menu file to use for this url
-	LLUrlMatch match;
-	std::string url = in_url;
-	if (! LLUrlRegistry::instance().findUrl(url, match))
-	{
-		return;
-	}
-	
-	std::string xui_file = match.getMenuName();
-	if (xui_file.empty())
-	{
-		return;
-	}
-
-	// set up the callbacks for all of the potential menu items, N.B. we
-	// don't use const ref strings in callbacks in case url goes out of scope
-	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
-	registrar.add("Url.Open", boost::bind(&LLUrlAction::openURL, url));
-	registrar.add("Url.OpenInternal", boost::bind(&LLUrlAction::openURLInternal, url));
-	registrar.add("Url.OpenExternal", boost::bind(&LLUrlAction::openURLExternal, url));
-	registrar.add("Url.Execute", boost::bind(&LLUrlAction::executeSLURL, url));
-	registrar.add("Url.Teleport", boost::bind(&LLUrlAction::teleportToLocation, url));
-	registrar.add("Url.ShowProfile", boost::bind(&LLUrlAction::showProfile, url));
-	registrar.add("Url.ShowOnMap", boost::bind(&LLUrlAction::showLocationOnMap, url));
-	registrar.add("Url.CopyLabel", boost::bind(&LLUrlAction::copyLabelToClipboard, url));
-	registrar.add("Url.CopyUrl", boost::bind(&LLUrlAction::copyURLToClipboard, url));
-
-	// create and return the context menu from the XUI file
-	delete mPopupMenu;
-	mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>(xui_file, LLMenuGL::sMenuContainer,
-																		 LLMenuHolderGL::child_registry_t::instance());	
-	if (mPopupMenu)
-	{
-		mPopupMenu->show(x, y);
-		LLMenuGL::showPopup(this, mPopupMenu, x, y);
-	}
-}
-
-void LLTextBase::setText(const LLStringExplicit &utf8str, const LLStyle::Params& input_params)
-{
-	// clear out the existing text and segments
-	getViewModel()->setDisplay(LLWStringUtil::null);
-
-	clearSegments();
-//	createDefaultSegment();
-
-	deselect();
-
-	// append the new text (supports Url linking)
-	std::string text(utf8str);
-	LLStringUtil::removeCRLF(text);
-
-	// appendText modifies mCursorPos...
-	appendText(text, false, input_params);
-	// ...so move cursor to top after appending text
-	startOfDoc();
-
-	onValueChange(0, getLength());
-}
-
-//virtual
-std::string LLTextBase::getText() const
-{
-	return getViewModel()->getValue().asString();
-}
-
-// IDEVO - icons can be UI image names or UUID sent from
-// server with avatar display name
-static LLUIImagePtr image_from_icon_name(const std::string& icon_name)
-{
-	if (LLUUID::validate(icon_name))
-	{
-		return LLUI::getUIImageByID( LLUUID(icon_name) );
-	}
-	else
-	{
-		return LLUI::getUIImage(icon_name);
-	}
-}
-
-void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params)
-{
-	LLStyle::Params style_params(input_params);
-	style_params.fillFrom(getDefaultStyleParams());
-
-	S32 part = (S32)LLTextParser::WHOLE;
-	if(mParseHTML)
-	{
-		S32 start=0,end=0;
-		LLUrlMatch match;
-		std::string text = new_text;
-		while ( LLUrlRegistry::instance().findUrl(text, match,
-		        boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3)) )
-		{
-			start = match.getStart();
-			end = match.getEnd()+1;
-
-			LLStyle::Params link_params(style_params);
-			link_params.overwriteFrom(match.getStyle());
-
-			// output the text before the Url
-			if (start > 0)
-			{
-				if (part == (S32)LLTextParser::WHOLE ||
-					part == (S32)LLTextParser::START)
-				{
-					part = (S32)LLTextParser::START;
-				}
-				else
-				{
-					part = (S32)LLTextParser::MIDDLE;
-				}
-				std::string subtext=text.substr(0,start);
-				appendAndHighlightText(subtext, part, style_params); 
-			}
-
-			// output an optional icon before the Url
-			if (! match.getIcon().empty())
-			{
-				LLUIImagePtr image = image_from_icon_name( match.getIcon() );
-				if (image)
-				{
-					LLStyle::Params icon_params;
-					icon_params.image = image;
-					// must refer to our link so we can update the icon later
-					// after name/group data is looked up
-					icon_params.link_href = match.getUrl();
-					// Text will be replaced during rendering with the icon,
-					// but string cannot be empty or the segment won't be
-					// added (or drawn).
-					appendImageSegment(part, icon_params);
-				}
-			}
-
-			// output the styled Url
-			appendAndHighlightTextImpl(match.getLabel(), part, link_params);
-			
-			// set the tooltip for the Url label
-			if (! match.getTooltip().empty())
-			{
-				segment_set_t::iterator it = getSegIterContaining(getLength()-1);
-				if (it != mSegments.end())
-					{
-						LLTextSegmentPtr segment = *it;
-						segment->setToolTip(match.getTooltip());
-					}
-			}
-
-			// move on to the rest of the text after the Url
-			if (end < (S32)text.length()) 
-			{
-				text = text.substr(end,text.length() - end);
-				end=0;
-				part=(S32)LLTextParser::END;
-			}
-			else
-			{
-				break;
-			}
-		}
-		if (part != (S32)LLTextParser::WHOLE) 
-			part=(S32)LLTextParser::END;
-		if (end < (S32)text.length()) 
-			appendAndHighlightText(text, part, style_params);		
-	}
-	else
-	{
-		appendAndHighlightText(new_text, part, style_params);
-	}
-}
-
-void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, const LLStyle::Params& input_params)
-{
-	if (new_text.empty()) 
-		return;
-
-	if(prepend_newline)
-		appendLineBreakSegment(input_params);
-	appendTextImpl(new_text,input_params);
-}
-
-void LLTextBase::needsReflow(S32 index)
-{
-	lldebugs << "reflow on object " << (void*)this << " index = " << mReflowIndex << ", new index = " << index << llendl;
-	mReflowIndex = llmin(mReflowIndex, index);
-}
-
-void LLTextBase::appendLineBreakSegment(const LLStyle::Params& style_params)
-{
-	segment_vec_t segments;
-	LLStyleConstSP sp(new LLStyle(style_params));
-	segments.push_back(new LLLineBreakTextSegment(sp, getLength()));
-
-	insertStringNoUndo(getLength(), utf8str_to_wstring("\n"), &segments);
-}
-
-void LLTextBase::appendImageSegment(S32 highlight_part, const LLStyle::Params& style_params)
-{
-	if(getPlainText())
-	{
-		return;
-	}
-	segment_vec_t segments;
-	LLStyleConstSP sp(new LLStyle(style_params));
-	segments.push_back(new LLImageTextSegment(sp, getLength(),*this));
-
-	insertStringNoUndo(getLength(), utf8str_to_wstring(" "), &segments);
-}
-
-
-
-void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params)
-{
-	// Save old state
-	S32 selection_start = mSelectionStart;
-	S32 selection_end = mSelectionEnd;
-	BOOL was_selecting = mIsSelecting;
-	S32 cursor_pos = mCursorPos;
-	S32 old_length = getLength();
-	BOOL cursor_was_at_end = (mCursorPos == old_length);
-
-	deselect();
-
-	setCursorPos(old_length);
-
-	if (mParseHighlights)
-	{
-		LLStyle::Params highlight_params(style_params);
-
-		LLSD pieces = LLTextParser::instance().parsePartialLineHighlights(new_text, highlight_params.color(), (LLTextParser::EHighlightPosition)highlight_part);
-		for (S32 i = 0; i < pieces.size(); i++)
-		{
-			LLSD color_llsd = pieces[i]["color"];
-			LLColor4 lcolor;
-			lcolor.setValue(color_llsd);
-			highlight_params.color = lcolor;
-
-			LLWString wide_text;
-				wide_text = utf8str_to_wstring(pieces[i]["text"].asString());
-
-			S32 cur_length = getLength();
-			LLStyleConstSP sp(new LLStyle(highlight_params));
-			LLTextSegmentPtr segmentp = new LLNormalTextSegment(sp, cur_length, cur_length + wide_text.size(), *this);
-			segment_vec_t segments;
-			segments.push_back(segmentp);
-			insertStringNoUndo(cur_length, wide_text, &segments);
-		}
-	}
-	else
-	{
-		LLWString wide_text;
-			wide_text = utf8str_to_wstring(new_text);
-
-		segment_vec_t segments;
-		S32 segment_start = old_length;
-		S32 segment_end = old_length + wide_text.size();
-		LLStyleConstSP sp(new LLStyle(style_params));
-		segments.push_back(new LLNormalTextSegment(sp, segment_start, segment_end, *this ));
-
-		insertStringNoUndo(getLength(), wide_text, &segments);
-	}
-
-	// Set the cursor and scroll position
-	if( selection_start != selection_end )
-	{
-		mSelectionStart = selection_start;
-		mSelectionEnd = selection_end;
-
-		mIsSelecting = was_selecting;
-		setCursorPos(cursor_pos);
-	}
-	else if( cursor_was_at_end )
-	{
-		setCursorPos(getLength());
-	}
-	else
-	{
-		setCursorPos(cursor_pos);
-	}
-}
-
-void LLTextBase::appendAndHighlightText(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params)
-{
-	if (new_text.empty()) return; 
-
-	std::string::size_type start = 0;
-	std::string::size_type pos = new_text.find("\n",start);
-	
-	while(pos!=-1)
-	{
-		if(pos!=start)
-		{
-			std::string str = std::string(new_text,start,pos-start);
-			appendAndHighlightTextImpl(str,highlight_part, style_params);
-		}
-		appendLineBreakSegment(style_params);
-		start = pos+1;
-		pos = new_text.find("\n",start);
-	}
-
-	std::string str = std::string(new_text,start,new_text.length()-start);
-	appendAndHighlightTextImpl(str,highlight_part, style_params);
-}
-
-
-void LLTextBase::replaceUrl(const std::string &url,
-							const std::string &label,
-							const std::string &icon)
-{
-	// get the full (wide) text for the editor so we can change it
-	LLWString text = getWText();
-	LLWString wlabel = utf8str_to_wstring(label);
-	bool modified = false;
-	S32 seg_start = 0;
-
-	// iterate through each segment looking for ones styled as links
-	segment_set_t::iterator it;
-	for (it = mSegments.begin(); it != mSegments.end(); ++it)
-	{
-		LLTextSegment *seg = *it;
-		LLStyleConstSP style = seg->getStyle();
-
-		// update segment start/end length in case we replaced text earlier
-		S32 seg_length = seg->getEnd() - seg->getStart();
-		seg->setStart(seg_start);
-		seg->setEnd(seg_start + seg_length);
-
-		// if we find a link with our Url, then replace the label
-		if (style->getLinkHREF() == url)
-		{
-			S32 start = seg->getStart();
-			S32 end = seg->getEnd();
-			text = text.substr(0, start) + wlabel + text.substr(end, text.size() - end + 1);
-			seg->setEnd(start + wlabel.size());
-			modified = true;
-		}
-
-		// Icon might be updated when more avatar or group info
-		// becomes available
-		if (style->isImage() && style->getLinkHREF() == url)
-		{
-			LLUIImagePtr image = image_from_icon_name( icon );
-			if (image)
-			{
-				LLStyle::Params icon_params;
-				icon_params.image = image;
-				LLStyleConstSP new_style(new LLStyle(icon_params));
-				seg->setStyle(new_style);
-				modified = true;
-			}
-		}
-
-		// work out the character offset for the next segment
-		seg_start = seg->getEnd();
-	}
-
-	// update the editor with the new (wide) text string
-	if (modified)
-	{
-		getViewModel()->setDisplay(text);
-		deselect();
-		setCursorPos(mCursorPos);
-		needsReflow();
-	}
-}
-
-
-void LLTextBase::setWText(const LLWString& text)
-{
-	setText(wstring_to_utf8str(text));
-}
-
-const LLWString& LLTextBase::getWText() const
-{
-    return getViewModel()->getDisplay();
-}
-
-// If round is true, if the position is on the right half of a character, the cursor
-// will be put to its right.  If round is false, the cursor will always be put to the
-// character's left.
-
-S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, bool hit_past_end_of_line) const
-{
-	// Figure out which line we're nearest to.
-	LLRect visible_region = getVisibleDocumentRect();
-	
-	// binary search for line that starts before local_y
-	line_list_t::const_iterator line_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), local_y - mVisibleTextRect.mBottom + visible_region.mBottom, compare_bottom());
-
-	if (line_iter == mLineInfoList.end())
-	{
-		return getLength(); // past the end
-	}
-	
-	S32 pos = getLength();
-	S32 start_x = mVisibleTextRect.mLeft + line_iter->mRect.mLeft - visible_region.mLeft;
-
-	segment_set_t::iterator line_seg_iter;
-	S32 line_seg_offset;
-	for(getSegmentAndOffset(line_iter->mDocIndexStart, &line_seg_iter, &line_seg_offset);
-		line_seg_iter != mSegments.end(); 
-		++line_seg_iter, line_seg_offset = 0)
-	{
-		const LLTextSegmentPtr segmentp = *line_seg_iter;
-
-		S32 segment_line_start = segmentp->getStart() + line_seg_offset;
-		S32 segment_line_length = llmin(segmentp->getEnd(), line_iter->mDocIndexEnd) - segment_line_start;
-		S32 text_width, text_height;
-		bool newline = segmentp->getDimensions(line_seg_offset, segment_line_length, text_width, text_height);
-
-		if(newline)
-		{
-			pos = segment_line_start + segmentp->getOffset(local_x - start_x, line_seg_offset, segment_line_length, round);
-			break;
-		}
-
-		// if we've reached a line of text *below* the mouse cursor, doc index is first character on that line
-		if (hit_past_end_of_line && local_y - mVisibleTextRect.mBottom + visible_region.mBottom > line_iter->mRect.mTop)
-		{
-			pos = segment_line_start;
-			break;
-		}
-		if (local_x < start_x + text_width)			// cursor to left of right edge of text
-		{
-			// Figure out which character we're nearest to.
-			S32 offset;
-			if (!segmentp->canEdit())
-			{
-				S32 segment_width, segment_height;
-				segmentp->getDimensions(0, segmentp->getEnd() - segmentp->getStart(), segment_width, segment_height);
-				if (round && local_x - start_x > segment_width / 2)
-				{
-					offset = segment_line_length;
-				}
-				else
-				{
-					offset = 0;
-				}
-			}
-			else
-			{
-				offset = segmentp->getOffset(local_x - start_x, line_seg_offset, segment_line_length, round);
-			}
-			pos = segment_line_start + offset;
-			break;
-		}
-		else if (hit_past_end_of_line && segmentp->getEnd() > line_iter->mDocIndexEnd - 1)	
-		{
-			// segment wraps to next line, so just set doc pos to the end of the line
-			// segment wraps to next line, so just set doc pos to start of next line (represented by mDocIndexEnd)
-			pos = llmin(getLength(), line_iter->mDocIndexEnd);
-			break;
-		}
-		start_x += text_width;
-	}
-
-	return pos;
-}
-
-// returns rectangle of insertion caret 
-// in document coordinate frame from given index into text
-LLRect LLTextBase::getDocRectFromDocIndex(S32 pos) const
-{
-	if (mLineInfoList.empty()) 
-	{ 
-		return LLRect();
-	}
-
-	LLRect doc_rect;
-
-	// clamp pos to valid values
-	pos = llclamp(pos, 0, mLineInfoList.back().mDocIndexEnd - 1);
-
-	// find line that contains cursor
-	line_list_t::const_iterator line_iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), pos, line_end_compare());
-
-	doc_rect.mLeft = line_iter->mRect.mLeft; 
-	doc_rect.mBottom = line_iter->mRect.mBottom;
-	doc_rect.mTop = line_iter->mRect.mTop;
-
-	segment_set_t::iterator line_seg_iter;
-	S32 line_seg_offset;
-	segment_set_t::iterator cursor_seg_iter;
-	S32 cursor_seg_offset;
-	getSegmentAndOffset(line_iter->mDocIndexStart, &line_seg_iter, &line_seg_offset);
-	getSegmentAndOffset(pos, &cursor_seg_iter, &cursor_seg_offset);
-
-	while(line_seg_iter != mSegments.end())
-	{
-		const LLTextSegmentPtr segmentp = *line_seg_iter;
-
-		if (line_seg_iter == cursor_seg_iter)
-		{
-			// cursor advanced to right based on difference in offset of cursor to start of line
-			S32 segment_width, segment_height;
-			segmentp->getDimensions(line_seg_offset, cursor_seg_offset - line_seg_offset, segment_width, segment_height);
-			doc_rect.mLeft += segment_width;
-
-			break;
-		}
-		else
-		{
-			// add remainder of current text segment to cursor position
-			S32 segment_width, segment_height;
-			segmentp->getDimensions(line_seg_offset, (segmentp->getEnd() - segmentp->getStart()) - line_seg_offset, segment_width, segment_height);
-			doc_rect.mLeft += segment_width;
-			// offset will be 0 for all segments after the first
-			line_seg_offset = 0;
-			// go to next text segment on this line
-			++line_seg_iter;
-		}
-	}
-
-	// set rect to 0 width
-	doc_rect.mRight = doc_rect.mLeft; 
-
-	return doc_rect;
-}
-
-LLRect LLTextBase::getLocalRectFromDocIndex(S32 pos) const
-{
-	LLRect content_window_rect = mScroller ? mScroller->getContentWindowRect() : getLocalRect();
-	if (mBorderVisible)
-	{
-		content_window_rect.stretch(-1);
-	}
-
-	LLRect local_rect;
-
-	if (mLineInfoList.empty()) 
-	{ 
-		// return default height rect in upper left
-		local_rect = content_window_rect;
-		local_rect.mBottom = local_rect.mTop - (S32)(mDefaultFont->getLineHeight());
-		return local_rect;
-	}
-
-	// get the rect in document coordinates
-	LLRect doc_rect = getDocRectFromDocIndex(pos);
-
-	// compensate for scrolled, inset view of doc
-	LLRect scrolled_view_rect = getVisibleDocumentRect();
-	local_rect = doc_rect;
-	local_rect.translate(content_window_rect.mLeft - scrolled_view_rect.mLeft, 
-						content_window_rect.mBottom - scrolled_view_rect.mBottom);
-
-	return local_rect;
-}
-
-void LLTextBase::updateCursorXPos()
-{
-	// reset desired x cursor position
-	mDesiredXPixel = getLocalRectFromDocIndex(mCursorPos).mLeft;
-}
-
-
-void LLTextBase::startOfLine()
-{
-	S32 offset = getLineOffsetFromDocIndex(mCursorPos);
-	setCursorPos(mCursorPos - offset);
-}
-
-void LLTextBase::endOfLine()
-{
-	S32 line = getLineNumFromDocIndex(mCursorPos);
-	S32 num_lines = getLineCount();
-	if (line + 1 >= num_lines)
-	{
-		setCursorPos(getLength());
-	}
-	else
-	{
-		setCursorPos( getLineStart(line + 1) - 1 );
-	}
-}
-
-void LLTextBase::startOfDoc()
-{
-	setCursorPos(0);
-	if (mScroller)
-	{
-		mScroller->goToTop();
-	}
-}
-
-void LLTextBase::endOfDoc()
-{
-	setCursorPos(getLength());
-	if (mScroller)
-	{
-		mScroller->goToBottom();
-	}
-}
-
-void LLTextBase::changePage( S32 delta )
-{
-	const S32 PIXEL_OVERLAP_ON_PAGE_CHANGE = 10;
-	if (delta == 0 || !mScroller) return;
-
-	LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);
-
-	if( delta == -1 )
-	{
-		mScroller->pageUp(PIXEL_OVERLAP_ON_PAGE_CHANGE);
-	}
-	else
-	if( delta == 1 )
-	{
-		mScroller->pageDown(PIXEL_OVERLAP_ON_PAGE_CHANGE);
-	}
-
-	if (getLocalRectFromDocIndex(mCursorPos) == cursor_rect)
-	{
-		// cursor didn't change apparent position, so move to top or bottom of document, respectively
-		if (delta < 0)
-		{
-			startOfDoc();
-		}
-		else
-		{
-			endOfDoc();
-		}
-	}
-	else
-	{
-		setCursorAtLocalPos(cursor_rect.getCenterX(), cursor_rect.getCenterY(), true, false);
-	}
-}
-
-// Picks a new cursor position based on the screen size of text being drawn.
-void LLTextBase::setCursorAtLocalPos( S32 local_x, S32 local_y, bool round, bool keep_cursor_offset )
-{
-	setCursorPos(getDocIndexFromLocalCoord(local_x, local_y, round), keep_cursor_offset);
-}
-
-
-void LLTextBase::changeLine( S32 delta )
-{
-	S32 line = getLineNumFromDocIndex(mCursorPos);
-
-	S32 new_line = line;
-	if( (delta < 0) && (line > 0 ) )
-	{
-		new_line = line - 1;
-	}
-	else if( (delta > 0) && (line < (getLineCount() - 1)) )
-	{
-		new_line = line + 1;
-	}
-
-	LLRect visible_region = getVisibleDocumentRect();
-
-	S32 new_cursor_pos = getDocIndexFromLocalCoord(mDesiredXPixel, mLineInfoList[new_line].mRect.mBottom + mVisibleTextRect.mBottom - visible_region.mBottom, TRUE);
-	setCursorPos(new_cursor_pos, true);
-}
-
-bool LLTextBase::scrolledToStart()
-{
-	return mScroller->isAtTop();
-}
-
-bool LLTextBase::scrolledToEnd()
-{
-	return mScroller->isAtBottom();
-}
-
-
-bool LLTextBase::setCursor(S32 row, S32 column)
-{
-	if (0 <= row && row < (S32)mLineInfoList.size())
-	{
-		S32 doc_pos = mLineInfoList[row].mDocIndexStart;
-		column = llclamp(column, 0, mLineInfoList[row].mDocIndexEnd - mLineInfoList[row].mDocIndexStart - 1);
-		doc_pos += column;
-		updateCursorXPos();
-
-		return setCursorPos(doc_pos);
-	}
-	return false;
-}
-
-
-bool LLTextBase::setCursorPos(S32 cursor_pos, bool keep_cursor_offset)
-{
-	S32 new_cursor_pos = cursor_pos;
-	if (new_cursor_pos != mCursorPos)
-	{
-		new_cursor_pos = getEditableIndex(new_cursor_pos, new_cursor_pos >= mCursorPos);
-	}
-
-	mCursorPos = llclamp(new_cursor_pos, 0, (S32)getLength());
-	needsScroll();
-	if (!keep_cursor_offset)
-		updateCursorXPos();
-	// did we get requested position?
-	return new_cursor_pos == cursor_pos;
-}
-
-// constraint cursor to editable segments of document
-S32 LLTextBase::getEditableIndex(S32 index, bool increasing_direction)
-{
-	segment_set_t::iterator segment_iter;
-	S32 offset;
-	getSegmentAndOffset(index, &segment_iter, &offset);
-	if (segment_iter == mSegments.end())
-	{
-		return 0;
-	}
-
-	LLTextSegmentPtr segmentp = *segment_iter;
-
-	if (segmentp->canEdit()) 
-	{
-		return segmentp->getStart() + offset;			
-	}
-	else if (segmentp->getStart() < index && index < segmentp->getEnd())
-	{
-		// bias towards document end
-		if (increasing_direction)
-		{
-			return segmentp->getEnd();
-		}
-		// bias towards document start
-		else
-		{
-			return segmentp->getStart();
-		}
-	}
-	else
-	{
-		return index;
-	}
-}
-
-void LLTextBase::updateRects()
-{
-	if (mLineInfoList.empty()) 
-	{
-		mTextBoundingRect = LLRect(0, mVPad, mHPad, 0);
-	}
-	else
-	{
-		mTextBoundingRect = mLineInfoList.begin()->mRect;
-		for (line_list_t::const_iterator line_iter = ++mLineInfoList.begin();
-			line_iter != mLineInfoList.end();
-			++line_iter)
-		{
-			mTextBoundingRect.unionWith(line_iter->mRect);
-		}
-
-		mTextBoundingRect.mTop += mVPad;
-		// subtract a pixel off the bottom to deal with rounding errors in measuring font height
-		mTextBoundingRect.mBottom -= 1;
-
-		S32 delta_pos = -mTextBoundingRect.mBottom;
-		// move line segments to fit new document rect
-		for (line_list_t::iterator it = mLineInfoList.begin(); it != mLineInfoList.end(); ++it)
-		{
-			it->mRect.translate(0, delta_pos);
-		}
-		mTextBoundingRect.translate(0, delta_pos);
-	}
-
-	// update document container dimensions according to text contents
-	LLRect doc_rect = mTextBoundingRect;
-	// use old mVisibleTextRect constraint document to width of viewable region
-	doc_rect.mLeft = 0;
-
-	// allow horizontal scrolling?
-	// if so, use entire width of text contents
-	// otherwise, stop at width of mVisibleTextRect
-	doc_rect.mRight = mScroller 
-		? llmax(mVisibleTextRect.getWidth(), mTextBoundingRect.mRight)
-		: mVisibleTextRect.getWidth();
-
-	mDocumentView->setShape(doc_rect);
-
-	//update mVisibleTextRect *after* mDocumentView has been resized
-	// so that scrollbars are added if document needs to scroll
-	// since mVisibleTextRect does not include scrollbars
-	LLRect old_text_rect = mVisibleTextRect;
-	mVisibleTextRect = mScroller ? mScroller->getContentWindowRect() : getLocalRect();
-	//FIXME: replace border with image?
-	if (mBorderVisible)
-	{
-		mVisibleTextRect.stretch(-1);
-	}
-	if (mVisibleTextRect != old_text_rect)
-	{
-		needsReflow();
-	}
-
-	// update document container again, using new mVisibleTextRect (that has scrollbars enabled as needed)
-	doc_rect.mRight = mScroller 
-		? llmax(mVisibleTextRect.getWidth(), mTextBoundingRect.mRight)
-		: mVisibleTextRect.getWidth();
-	mDocumentView->setShape(doc_rect);
-}
-
-
-void LLTextBase::startSelection()
-{
-	if( !mIsSelecting )
-	{
-		mIsSelecting = TRUE;
-		mSelectionStart = mCursorPos;
-		mSelectionEnd = mCursorPos;
-	}
-}
-
-void LLTextBase::endSelection()
-{
-	if( mIsSelecting )
-	{
-		mIsSelecting = FALSE;
-		mSelectionEnd = mCursorPos;
-	}
-}
-
-// get portion of document that is visible in text editor
-LLRect LLTextBase::getVisibleDocumentRect() const
-{
-	if (mScroller)
-	{
-		return mScroller->getVisibleContentRect();
-	}
-	else
-	{
-		// entire document rect is visible when not scrolling
-		// but offset according to height of widget
-		LLRect doc_rect = mDocumentView->getLocalRect();
-		doc_rect.mLeft -= mDocumentView->getRect().mLeft;
-		// adjust for height of text above widget baseline
-		doc_rect.mBottom = doc_rect.getHeight() - mVisibleTextRect.getHeight();
-		return doc_rect;
-	}
-}
-
-//
-// LLTextSegment
-//
-
-LLTextSegment::~LLTextSegment()
-{}
-
-bool LLTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const { width = 0; height = 0; return false;}
-S32	LLTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const { return 0; }
-S32	LLTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const { return 0; }
-void LLTextSegment::updateLayout(const LLTextBase& editor) {}
-F32	LLTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect) { return draw_rect.mLeft; }
-bool LLTextSegment::canEdit() const { return false; }
-void LLTextSegment::unlinkFromDocument(LLTextBase*) {}
-void LLTextSegment::linkToDocument(LLTextBase*) {}
-const LLColor4& LLTextSegment::getColor() const { return LLColor4::white; }
-//void LLTextSegment::setColor(const LLColor4 &color) {}
-LLStyleConstSP LLTextSegment::getStyle() const {static LLStyleConstSP sp(new LLStyle()); return sp; }
-void LLTextSegment::setStyle(LLStyleConstSP style) {}
-void LLTextSegment::setToken( LLKeywordToken* token ) {}
-LLKeywordToken*	LLTextSegment::getToken() const { return NULL; }
-void LLTextSegment::setToolTip( const std::string &msg ) {}
-void LLTextSegment::dump() const {}
-BOOL LLTextSegment::handleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleMouseUp(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleMiddleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleMiddleMouseUp(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleRightMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleRightMouseUp(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleDoubleClick(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleHover(S32 x, S32 y, MASK mask) { return FALSE; }
-BOOL LLTextSegment::handleScrollWheel(S32 x, S32 y, S32 clicks) { return FALSE; }
-BOOL LLTextSegment::handleToolTip(S32 x, S32 y, MASK mask) { return FALSE; }
-std::string	LLTextSegment::getName() const { return ""; }
-void LLTextSegment::onMouseCaptureLost() {}
-void LLTextSegment::screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {}
-void LLTextSegment::localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {}
-BOOL LLTextSegment::hasMouseCapture() { return FALSE; }
-
-//
-// LLNormalTextSegment
-//
-
-LLNormalTextSegment::LLNormalTextSegment( LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor ) 
-:	LLTextSegment(start, end),
-	mStyle( style ),
-	mToken(NULL),
-	mEditor(editor)
-{
-	mFontHeight = llceil(mStyle->getFont()->getLineHeight());
-
-	LLUIImagePtr image = mStyle->getImage();
-	if (image.notNull())
-	{
-		mImageLoadedConnection = image->addLoadedCallback(boost::bind(&LLTextBase::needsReflow, &mEditor, start));
-	}
-}
-
-LLNormalTextSegment::LLNormalTextSegment( const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible) 
-:	LLTextSegment(start, end),
-	mToken(NULL),
-	mEditor(editor)
-{
-	mStyle = new LLStyle(LLStyle::Params().visible(is_visible).color(color));
-
-	mFontHeight = llceil(mStyle->getFont()->getLineHeight());
-}
-
-LLNormalTextSegment::~LLNormalTextSegment()
-{
-	mImageLoadedConnection.disconnect();
-}
-
-
-F32 LLNormalTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
-{
-	if( end - start > 0 )
-	{
-		return drawClippedSegment( getStart() + start, getStart() + end, selection_start, selection_end, draw_rect);
-	}
-	return draw_rect.mLeft;
-}
-
-// Draws a single text segment, reversing the color for selection if needed.
-F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 selection_start, S32 selection_end, LLRect rect)
-{
-	F32 alpha = LLViewDrawContext::getCurrentContext().mAlpha;
-
-	const LLWString &text = mEditor.getWText();
-
-	F32 right_x = rect.mLeft;
-	if (!mStyle->isVisible())
-	{
-		return right_x;
-	}
-
-	const LLFontGL* font = mStyle->getFont();
-
-	LLColor4 color = (mEditor.getReadOnly() ? mStyle->getReadOnlyColor() : mStyle->getColor())  % alpha;
-
-  	if( selection_start > seg_start )
-	{
-		// Draw normally
-		S32 start = seg_start;
-		S32 end = llmin( selection_start, seg_end );
-		S32 length =  end - start;
-		font->render(text, start, 
-			     rect.mLeft, rect.mTop, 
-			     color, 
-			     LLFontGL::LEFT, LLFontGL::TOP, 
-			     LLFontGL::NORMAL, 
-			     mStyle->getShadowType(), 
-			     length, rect.getWidth(), 
-			     &right_x, 
-			     mEditor.getUseEllipses());
-	}
-	rect.mLeft = (S32)ceil(right_x);
-	
-	if( (selection_start < seg_end) && (selection_end > seg_start) )
-	{
-		// Draw reversed
-		S32 start = llmax( selection_start, seg_start );
-		S32 end = llmin( selection_end, seg_end );
-		S32 length = end - start;
-
-		font->render(text, start, 
-			     rect.mLeft, rect.mTop,
-			     LLColor4( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], 1.f ),
-			     LLFontGL::LEFT, LLFontGL::TOP, 
-			     LLFontGL::NORMAL, 
-			     LLFontGL::NO_SHADOW, 
-			     length, rect.getWidth(), 
-			     &right_x, 
-			     mEditor.getUseEllipses());
-	}
-	rect.mLeft = (S32)ceil(right_x);
-	if( selection_end < seg_end )
-	{
-		// Draw normally
-		S32 start = llmax( selection_end, seg_start );
-		S32 end = seg_end;
-		S32 length = end - start;
-		font->render(text, start, 
-			     rect.mLeft, rect.mTop, 
-			     color, 
-			     LLFontGL::LEFT, LLFontGL::TOP, 
-			     LLFontGL::NORMAL, 
-			     mStyle->getShadowType(), 
-			     length, rect.getWidth(), 
-			     &right_x, 
-			     mEditor.getUseEllipses());
-	}
-	return right_x;
-}
-
-BOOL LLNormalTextSegment::handleHover(S32 x, S32 y, MASK mask)
-{
-	if (getStyle() && getStyle()->isLink())
-	{
-		// Only process the click if it's actually in this segment, not to the right of the end-of-line.
-		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)
-		{
-			LLUI::getWindow()->setCursor(UI_CURSOR_HAND);
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-BOOL LLNormalTextSegment::handleRightMouseDown(S32 x, S32 y, MASK mask)
-{
-	if (getStyle() && getStyle()->isLink())
-	{
-		// Only process the click if it's actually in this segment, not to the right of the end-of-line.
-		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)
-		{
-			mEditor.createUrlContextMenu(x, y, getStyle()->getLinkHREF());
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-BOOL LLNormalTextSegment::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	if (getStyle() && getStyle()->isLink())
-	{
-		// Only process the click if it's actually in this segment, not to the right of the end-of-line.
-		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)
-		{
-			// eat mouse down event on hyperlinks, so we get the mouse up
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-BOOL LLNormalTextSegment::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	if (getStyle() && getStyle()->isLink())
-	{
-		// Only process the click if it's actually in this segment, not to the right of the end-of-line.
-		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)
-		{
-			LLUrlAction::clickAction(getStyle()->getLinkHREF());
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-BOOL LLNormalTextSegment::handleToolTip(S32 x, S32 y, MASK mask)
-{
-	std::string msg;
-	// do we have a tooltip for a loaded keyword (for script editor)?
-	if (mToken && !mToken->getToolTip().empty())
-	{
-		const LLWString& wmsg = mToken->getToolTip();
-		LLToolTipMgr::instance().show(wstring_to_utf8str(wmsg));
-		return TRUE;
-	}
-	// or do we have an explicitly set tooltip (e.g., for Urls)
-	if (!mTooltip.empty())
-	{
-		LLToolTipMgr::instance().show(mTooltip);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void LLNormalTextSegment::setToolTip(const std::string& tooltip)
-{
-	// we cannot replace a keyword tooltip that's loaded from a file
-	if (mToken)
-	{
-		llwarns << "LLTextSegment::setToolTip: cannot replace keyword tooltip." << llendl;
-		return;
-	}
-	mTooltip = tooltip;
-}
-
-bool LLNormalTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const
-{
-	height = 0;
-	width = 0;
-	if (num_chars > 0)
-	{
-		height = mFontHeight;
-		const LLWString &text = mEditor.getWText();
-		// if last character is a newline, then return true, forcing line break
-			width = mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars);
-		}
-	return false;
-}
-
-S32	LLNormalTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const
-{
-	const LLWString &text = mEditor.getWText();
-	return mStyle->getFont()->charFromPixelOffset(text.c_str(), mStart + start_offset,
-											   (F32)segment_local_x_coord,
-											   F32_MAX,
-											   num_chars,
-											   round);
-}
-
-S32	LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
-{
-	const LLWString &text = mEditor.getWText();
-
-	LLUIImagePtr image = mStyle->getImage();
-	if( image.notNull())
-	{
-		num_pixels = llmax(0, num_pixels - image->getWidth());
-	}
-
-	S32 last_char = mEnd;
-
-	// set max characters to length of segment, or to first newline
-	max_chars = llmin(max_chars, last_char - (mStart + segment_offset));
-
-	// if no character yet displayed on this line, don't require word wrapping since
-	// we can just move to the next line, otherwise insist on it so we make forward progress
-	LLFontGL::EWordWrapStyle word_wrap_style = (line_offset == 0) 
-		? LLFontGL::WORD_BOUNDARY_IF_POSSIBLE 
-		: LLFontGL::ONLY_WORD_BOUNDARIES;
-	S32 num_chars = mStyle->getFont()->maxDrawableChars(text.c_str() + segment_offset + mStart, 
-												(F32)num_pixels,
-												max_chars, 
-												word_wrap_style);
-
-	if (num_chars == 0 
-		&& line_offset == 0 
-		&& max_chars > 0)
-	{
-		// If at the beginning of a line, and a single character won't fit, draw it anyway
-		num_chars = 1;
-	}
-
-	// include *either* the EOF or newline character in this run of text
-	// but not both
-	S32 last_char_in_run = mStart + segment_offset + num_chars;
-	// check length first to avoid indexing off end of string
-	if (last_char_in_run < mEnd 
-		&& (last_char_in_run >= mEditor.getLength() ))
-	{
-		num_chars++;
-	}
-	return num_chars;
-}
-
-void LLNormalTextSegment::dump() const
-{
-	llinfos << "Segment [" << 
-//			mColor.mV[VX] << ", " <<
-//			mColor.mV[VY] << ", " <<
-//			mColor.mV[VZ] << "]\t[" <<
-		mStart << ", " <<
-		getEnd() << "]" <<
-		llendl;
-}
-
-
-//
-// LLInlineViewSegment
-//
-
-LLInlineViewSegment::LLInlineViewSegment(const Params& p, S32 start, S32 end)
-:	LLTextSegment(start, end),
-	mView(p.view),
-	mForceNewLine(p.force_newline),
-	mLeftPad(p.left_pad),
-	mRightPad(p.right_pad),
-	mTopPad(p.top_pad),
-	mBottomPad(p.bottom_pad)
-{
-} 
-
-LLInlineViewSegment::~LLInlineViewSegment()
-{
-	mView->die();
-}
-
-bool LLInlineViewSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const
-{
-	if (first_char == 0 && num_chars == 0) 
-	{
-		// we didn't fit on a line, the widget will fall on the next line
-		// so dimensions here are 0
-		width = 0;
-		height = 0;
-	}
-	else
-	{
-		width = mLeftPad + mRightPad + mView->getRect().getWidth();
-		height = mBottomPad + mTopPad + mView->getRect().getHeight();
-	}
-
-	return false;
-}
-
-S32	LLInlineViewSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
-{
-	// if putting a widget anywhere but at the beginning of a line
-	// and the widget doesn't fit or mForceNewLine is true
-	// then return 0 chars for that line, and all characters for the next
-	if (line_offset != 0 
-		&& (mForceNewLine || num_pixels < mView->getRect().getWidth())) 
-	{
-		return 0;
-	}
-	else
-	{
-		return mEnd - mStart;
-	}
-}
-
-void LLInlineViewSegment::updateLayout(const LLTextBase& editor)
-{
-	LLRect start_rect = editor.getDocRectFromDocIndex(mStart);
-	mView->setOrigin(start_rect.mLeft + mLeftPad, start_rect.mBottom + mBottomPad);
-}
-
-F32	LLInlineViewSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
-{
-	// return padded width of widget
-	// widget is actually drawn during mDocumentView's draw()
-	return (F32)(draw_rect.mLeft + mView->getRect().getWidth() + mLeftPad + mRightPad);
-}
-
-void LLInlineViewSegment::unlinkFromDocument(LLTextBase* editor)
-{
-	editor->removeDocumentChild(mView);
-}
-
-void LLInlineViewSegment::linkToDocument(LLTextBase* editor)
-{
-	editor->addDocumentChild(mView);
-}
-
-LLLineBreakTextSegment::LLLineBreakTextSegment(S32 pos):LLTextSegment(pos,pos+1)
-{
-	LLStyleSP s( new LLStyle(LLStyle::Params().visible(true)));
-
-	mFontHeight = llceil(s->getFont()->getLineHeight());
-}
-LLLineBreakTextSegment::LLLineBreakTextSegment(LLStyleConstSP style,S32 pos):LLTextSegment(pos,pos+1)
-{
-	mFontHeight = llceil(style->getFont()->getLineHeight());
-}
-LLLineBreakTextSegment::~LLLineBreakTextSegment()
-{
-}
-bool LLLineBreakTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const
-{
-	width = 0;
-	height = mFontHeight;
-
-	return true;
-}
-S32	LLLineBreakTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
-{
-	return 1;
-}
-F32	LLLineBreakTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
-{
-	return  draw_rect.mLeft;
-}
-
-LLImageTextSegment::LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor)
-	:LLTextSegment(pos,pos+1)
-	,mStyle( style )
-	,mEditor(editor)
-{
-}
-
-LLImageTextSegment::~LLImageTextSegment()
-{
-}
-
-static const S32 IMAGE_HPAD = 3;
-
-bool LLImageTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const
-{
-	width = 0;
-	height = llceil(mStyle->getFont()->getLineHeight());;
-
-	LLUIImagePtr image = mStyle->getImage();
-	if( num_chars>0 && image.notNull())
-	{
-		width += image->getWidth() + IMAGE_HPAD;
-		height = llmax(height, image->getHeight() + IMAGE_HPAD );
-	}
-	return false;
-}
-
-S32	 LLImageTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
-{
-	LLUIImagePtr image = mStyle->getImage();
-	S32 image_width = image->getWidth();
-	if(line_offset == 0 || num_pixels>image_width + IMAGE_HPAD)
-	{
-		return 1;
-	}
-	return 0;
-}
-
-F32	LLImageTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
-{
-	if ( (start >= 0) && (end <= mEnd - mStart))
-	{
-		LLColor4 color = LLColor4::white % mEditor.getDrawContext().mAlpha;
-		LLUIImagePtr image = mStyle->getImage();
-		S32 style_image_height = image->getHeight();
-		S32 style_image_width = image->getWidth();
-		// Text is drawn from the top of the draw_rect downward
-		
-		S32 text_center = draw_rect.mTop - (draw_rect.getHeight() / 2);
-		// Align image to center of draw rect
-		S32 image_bottom = text_center - (style_image_height / 2);
-		image->draw(draw_rect.mLeft, image_bottom, 
-			style_image_width, style_image_height, color);
-		
-		const S32 IMAGE_HPAD = 3;
-		return draw_rect.mLeft + style_image_width + IMAGE_HPAD;
-	}
-	return 0.0;
-}
-
+/** 

+ * @file lltextbase.cpp

+ * @author Martin Reddy

+ * @brief The base class of text box/editor, providing Url handling support

+ *

+ * $LicenseInfo:firstyear=2009&license=viewergpl$

+ * 

+ * Copyright (c) 2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "linden_common.h"

+

+#include "lltextbase.h"

+

+#include "lllocalcliprect.h"

+#include "llmenugl.h"

+#include "llscrollcontainer.h"

+#include "llstl.h"

+#include "lltextparser.h"

+#include "lltextutil.h"

+#include "lltooltip.h"

+#include "lluictrl.h"

+#include "llurlaction.h"

+#include "llurlregistry.h"

+#include "llview.h"

+#include "llwindow.h"

+#include <boost/bind.hpp>

+

+const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds

+const S32	CURSOR_THICKNESS = 2;

+

+LLTextBase::line_info::line_info(S32 index_start, S32 index_end, LLRect rect, S32 line_num) 

+:	mDocIndexStart(index_start), 

+	mDocIndexEnd(index_end),

+	mRect(rect),

+	mLineNum(line_num)

+{}

+

+bool LLTextBase::compare_segment_end::operator()(const LLTextSegmentPtr& a, const LLTextSegmentPtr& b) const

+{

+	// sort empty spans (e.g. 11-11) after previous non-empty spans (e.g. 5-11)

+	if (a->getEnd() == b->getEnd())

+	{

+		return a->getStart() < b->getStart();

+	}

+	return a->getEnd() < b->getEnd();

+}

+

+

+// helper functors

+struct LLTextBase::compare_bottom

+{

+	bool operator()(const S32& a, const LLTextBase::line_info& b) const

+	{

+		return a > b.mRect.mBottom; // bottom of a is higher than bottom of b

+	}

+

+	bool operator()(const LLTextBase::line_info& a, const S32& b) const

+	{

+		return a.mRect.mBottom > b; // bottom of a is higher than bottom of b

+	}

+

+	bool operator()(const LLTextBase::line_info& a, const LLTextBase::line_info& b) const

+	{

+		return a.mRect.mBottom > b.mRect.mBottom; // bottom of a is higher than bottom of b

+	}

+

+};

+

+// helper functors

+struct LLTextBase::compare_top

+{

+	bool operator()(const S32& a, const LLTextBase::line_info& b) const

+	{

+		return a > b.mRect.mTop; // top of a is higher than top of b

+	}

+

+	bool operator()(const LLTextBase::line_info& a, const S32& b) const

+	{

+		return a.mRect.mTop > b; // top of a is higher than top of b

+	}

+

+	bool operator()(const LLTextBase::line_info& a, const LLTextBase::line_info& b) const

+	{

+		return a.mRect.mTop > b.mRect.mTop; // top of a is higher than top of b

+	}

+};

+

+struct LLTextBase::line_end_compare

+{

+	bool operator()(const S32& pos, const LLTextBase::line_info& info) const

+	{

+		return (pos < info.mDocIndexEnd);

+	}

+

+	bool operator()(const LLTextBase::line_info& info, const S32& pos) const

+	{

+		return (info.mDocIndexEnd < pos);

+	}

+

+	bool operator()(const LLTextBase::line_info& a, const LLTextBase::line_info& b) const

+	{

+		return (a.mDocIndexEnd < b.mDocIndexEnd);

+	}

+

+};

+

+//////////////////////////////////////////////////////////////////////////

+//

+// LLTextBase

+//

+

+// register LLTextBase::Params under name "textbase"

+static LLWidgetNameRegistry::StaticRegistrar sRegisterTextBaseParams(&typeid(LLTextBase::Params), "textbase");

+

+LLTextBase::LineSpacingParams::LineSpacingParams()

+:	multiple("multiple", 1.f),

+	pixels("pixels", 0)

+{

+}

+

+

+LLTextBase::Params::Params()

+:	cursor_color("cursor_color"),

+	text_color("text_color"),

+	text_readonly_color("text_readonly_color"),

+	bg_visible("bg_visible", false),

+	border_visible("border_visible", false),

+	bg_readonly_color("bg_readonly_color"),

+	bg_writeable_color("bg_writeable_color"),

+	bg_focus_color("bg_focus_color"),

+	allow_scroll("allow_scroll", true),

+	plain_text("plain_text",false),

+	track_end("track_end", false),

+	read_only("read_only", false),

+	v_pad("v_pad", 0),

+	h_pad("h_pad", 0),

+	clip_partial("clip_partial", true),

+	line_spacing("line_spacing"),

+	max_text_length("max_length", 255),

+	font_shadow("font_shadow"),

+	wrap("wrap"),

+	use_ellipses("use_ellipses", false),

+	allow_html("allow_html", false),

+	parse_highlights("parse_highlights", false)

+{

+	addSynonym(track_end, "track_bottom");

+	addSynonym(wrap, "word_wrap");

+}

+

+

+LLTextBase::LLTextBase(const LLTextBase::Params &p) 

+:	LLUICtrl(p, LLTextViewModelPtr(new LLTextViewModel)),

+	mURLClickSignal(),

+	mMaxTextByteLength( p.max_text_length ),

+	mDefaultFont(p.font),

+	mFontShadow(p.font_shadow),

+	mPopupMenu(NULL),

+	mReadOnly(p.read_only),

+	mCursorColor(p.cursor_color),

+	mFgColor(p.text_color),

+	mBorderVisible( p.border_visible ),

+	mReadOnlyFgColor(p.text_readonly_color),

+	mWriteableBgColor(p.bg_writeable_color),

+	mReadOnlyBgColor(p.bg_readonly_color),

+	mFocusBgColor(p.bg_focus_color),

+	mReflowIndex(S32_MAX),

+	mCursorPos( 0 ),

+	mScrollNeeded(FALSE),

+	mDesiredXPixel(-1),

+	mHPad(p.h_pad),

+	mVPad(p.v_pad),

+	mHAlign(p.font_halign),

+	mVAlign(p.font_valign),

+	mLineSpacingMult(p.line_spacing.multiple),

+	mLineSpacingPixels(p.line_spacing.pixels),

+	mClipPartial(p.clip_partial && !p.allow_scroll),

+	mTrackEnd( p.track_end ),

+	mScrollIndex(-1),

+	mSelectionStart( 0 ),

+	mSelectionEnd( 0 ),

+	mIsSelecting( FALSE ),

+	mPlainText ( p.plain_text ),

+	mWordWrap(p.wrap),

+	mUseEllipses( p.use_ellipses ),

+	mParseHTML(p.allow_html),

+	mParseHighlights(p.parse_highlights),

+	mBGVisible(p.bg_visible),

+	mScroller(NULL)

+{

+	if(p.allow_scroll)

+	{

+		LLScrollContainer::Params scroll_params;

+		scroll_params.name = "text scroller";

+		scroll_params.rect = getLocalRect();

+		scroll_params.follows.flags = FOLLOWS_ALL;

+		scroll_params.is_opaque = false;

+		scroll_params.mouse_opaque = false;

+		scroll_params.min_auto_scroll_rate = 200;

+		scroll_params.max_auto_scroll_rate = 800;

+		scroll_params.border_visible = p.border_visible;

+		mScroller = LLUICtrlFactory::create<LLScrollContainer>(scroll_params);

+		addChild(mScroller);

+	}

+

+	LLView::Params view_params;

+	view_params.name = "text_contents";

+	view_params.rect =  LLRect(0, 500, 500, 0);

+	view_params.mouse_opaque = false;

+

+	mDocumentView = LLUICtrlFactory::create<LLView>(view_params);

+	if (mScroller)

+	{

+		mScroller->addChild(mDocumentView);

+	}

+	else

+	{

+		addChild(mDocumentView);

+	}

+

+	createDefaultSegment();

+

+	updateRects();

+}

+

+LLTextBase::~LLTextBase()

+{

+	// Menu, like any other LLUICtrl, is deleted by its parent - gMenuHolder

+

+	mSegments.clear();

+}

+

+void LLTextBase::initFromParams(const LLTextBase::Params& p)

+{

+	LLUICtrl::initFromParams(p);

+	resetDirty();		// Update saved text state

+	updateSegments();

+

+	// HACK: work around enabled == readonly design bug -- RN

+	// setEnabled will modify our read only status, so do this after

+	// LLTextBase::initFromParams

+	if (p.read_only.isProvided())

+	{

+		mReadOnly = p.read_only;

+	}

+

+	// HACK:  text editors always need to be enabled so that we can scroll

+	LLView::setEnabled(true);

+}

+

+bool LLTextBase::truncate()

+{

+	BOOL did_truncate = FALSE;

+

+	// First rough check - if we're less than 1/4th the size, we're OK

+	if (getLength() >= S32(mMaxTextByteLength / 4))

+	{	

+		// Have to check actual byte size

+        LLWString text(getWText());

+		S32 utf8_byte_size = wstring_utf8_length(text);

+		if ( utf8_byte_size > mMaxTextByteLength )

+		{

+			// Truncate safely in UTF-8

+			std::string temp_utf8_text = wstring_to_utf8str(text);

+			temp_utf8_text = utf8str_truncate( temp_utf8_text, mMaxTextByteLength );

+			LLWString text = utf8str_to_wstring( temp_utf8_text );

+			// remove extra bit of current string, to preserve formatting, etc.

+			removeStringNoUndo(text.size(), getWText().size() - text.size());

+			did_truncate = TRUE;

+		}

+	}

+

+	return did_truncate;

+}

+

+LLStyle::Params LLTextBase::getDefaultStyleParams()

+{

+	return LLStyle::Params()

+		.color(LLUIColor(&mFgColor))

+		.readonly_color(LLUIColor(&mReadOnlyFgColor))

+		.font(mDefaultFont)

+		.drop_shadow(mFontShadow);

+}

+

+void LLTextBase::onValueChange(S32 start, S32 end)

+{

+}

+

+

+// Draws the black box behind the selected text

+void LLTextBase::drawSelectionBackground()

+{

+	// Draw selection even if we don't have keyboard focus for search/replace

+	if( hasSelection() && !mLineInfoList.empty())

+	{

+		std::vector<LLRect> selection_rects;

+

+		S32 selection_left		= llmin( mSelectionStart, mSelectionEnd );

+		S32 selection_right		= llmax( mSelectionStart, mSelectionEnd );

+		LLRect selection_rect = mVisibleTextRect;

+

+		// Skip through the lines we aren't drawing.

+		LLRect content_display_rect = getVisibleDocumentRect();

+

+		// binary search for line that starts before top of visible buffer

+		line_list_t::const_iterator line_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), content_display_rect.mTop, compare_bottom());

+		line_list_t::const_iterator end_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), content_display_rect.mBottom, compare_top());

+

+		bool done = false;

+

+		// Find the coordinates of the selected area

+		for (;line_iter != end_iter && !done; ++line_iter)

+		{

+			// is selection visible on this line?

+			if (line_iter->mDocIndexEnd > selection_left && line_iter->mDocIndexStart < selection_right)

+			{

+				segment_set_t::iterator segment_iter;

+				S32 segment_offset;

+				getSegmentAndOffset(line_iter->mDocIndexStart, &segment_iter, &segment_offset);

+				

+				LLRect selection_rect;

+				selection_rect.mLeft = line_iter->mRect.mLeft;

+				selection_rect.mRight = line_iter->mRect.mLeft;

+				selection_rect.mBottom = line_iter->mRect.mBottom;

+				selection_rect.mTop = line_iter->mRect.mTop;

+					

+				for(;segment_iter != mSegments.end(); ++segment_iter, segment_offset = 0)

+				{

+					LLTextSegmentPtr segmentp = *segment_iter;

+

+					S32 segment_line_start = segmentp->getStart() + segment_offset;

+					S32 segment_line_end = llmin(segmentp->getEnd(), line_iter->mDocIndexEnd);

+

+					if (segment_line_start > segment_line_end) break;

+

+					S32 segment_width = 0;

+					S32 segment_height = 0;

+

+					// if selection after beginning of segment

+					if(selection_left >= segment_line_start)

+					{

+						S32 num_chars = llmin(selection_left, segment_line_end) - segment_line_start;

+						segmentp->getDimensions(segment_offset, num_chars, segment_width, segment_height);

+						selection_rect.mLeft += segment_width;

+					}

+

+					// if selection_right == segment_line_end then that means we are the first character of the next segment

+					// or first character of the next line, in either case we want to add the length of the current segment

+					// to the selection rectangle and continue.

+					// if selection right > segment_line_end then selection spans end of current segment...

+					if (selection_right >= segment_line_end)

+					{

+						// extend selection slightly beyond end of line

+						// to indicate selection of newline character (use "n" character to determine width)

+						S32 num_chars = segment_line_end - segment_line_start;

+						segmentp->getDimensions(segment_offset, num_chars, segment_width, segment_height);

+						selection_rect.mRight += segment_width;

+					}

+					// else if selection ends on current segment...

+					else

+					{

+						S32 num_chars = selection_right - segment_line_start;

+						segmentp->getDimensions(segment_offset, num_chars, segment_width, segment_height);

+						selection_rect.mRight += segment_width;

+

+						break;

+					}

+				}

+				selection_rects.push_back(selection_rect);

+			}

+		}

+		

+		// Draw the selection box (we're using a box instead of reversing the colors on the selected text).

+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);

+		const LLColor4& color = mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get();

+		F32 alpha = hasFocus() ? 0.7f : 0.3f;

+		alpha *= getDrawContext().mAlpha;

+		LLColor4 selection_color(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE], alpha);

+

+		for (std::vector<LLRect>::iterator rect_it = selection_rects.begin();

+			rect_it != selection_rects.end();

+			++rect_it)

+		{

+			LLRect selection_rect = *rect_it;

+			selection_rect.translate(mVisibleTextRect.mLeft - content_display_rect.mLeft, mVisibleTextRect.mBottom - content_display_rect.mBottom);

+			gl_rect_2d(selection_rect, selection_color);

+		}

+	}

+}

+

+void LLTextBase::drawCursor()

+{

+	F32 alpha = getDrawContext().mAlpha;

+

+	if( hasFocus()

+		&& gFocusMgr.getAppHasFocus()

+		&& !mReadOnly)

+	{

+		const LLWString &wtext = getWText();

+		const llwchar* text = wtext.c_str();

+

+		LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);

+		cursor_rect.translate(-1, 0);

+		segment_set_t::iterator seg_it = getSegIterContaining(mCursorPos);

+

+		// take style from last segment

+		LLTextSegmentPtr segmentp;

+

+		if (seg_it != mSegments.end())

+		{

+			segmentp = *seg_it;

+		}

+		else

+		{

+			//segmentp = mSegments.back();

+			return;

+		}

+

+		// Draw the cursor

+		// (Flash the cursor every half second starting a fixed time after the last keystroke)

+		F32 elapsed = mCursorBlinkTimer.getElapsedTimeF32();

+		if( (elapsed < CURSOR_FLASH_DELAY ) || (S32(elapsed * 2) & 1) )

+		{

+

+			if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())

+			{

+				S32 segment_width = 0;

+				S32 segment_height = 0;

+				segmentp->getDimensions(mCursorPos - segmentp->getStart(), 1, segment_width, segment_height);

+				S32 width = llmax(CURSOR_THICKNESS, segment_width);

+				cursor_rect.mRight = cursor_rect.mLeft + width;

+			}

+			else

+			{

+				cursor_rect.mRight = cursor_rect.mLeft + CURSOR_THICKNESS;

+			}

+			

+			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);

+

+			LLColor4 cursor_color = mCursorColor.get() % alpha;

+			gGL.color4fv( cursor_color.mV );

+			

+			gl_rect_2d(cursor_rect);

+

+			if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection() && text[mCursorPos] != '\n')

+			{

+				LLColor4 text_color;

+				const LLFontGL* fontp;

+				if (segmentp)

+				{

+					text_color = segmentp->getColor();

+					fontp = segmentp->getStyle()->getFont();

+				}

+				else if (mReadOnly)

+				{

+					text_color = mReadOnlyFgColor.get();

+					fontp = mDefaultFont;

+				}

+				else

+				{

+					text_color = mFgColor.get();

+					fontp = mDefaultFont;

+				}

+				fontp->render(text, mCursorPos, cursor_rect, 

+					LLColor4(1.f - text_color.mV[VRED], 1.f - text_color.mV[VGREEN], 1.f - text_color.mV[VBLUE], alpha),

+					LLFontGL::LEFT, mVAlign,

+					LLFontGL::NORMAL,

+					LLFontGL::NO_SHADOW,

+					1);

+			}

+

+			// Make sure the IME is in the right place

+			LLRect screen_pos = calcScreenRect();

+			LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_rect.mLeft), screen_pos.mBottom + llfloor(cursor_rect.mTop) );

+

+			ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);

+			ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]);

+			getWindow()->setLanguageTextInput( ime_pos );

+		}

+	}

+}

+

+void LLTextBase::drawText()

+{

+	const S32 text_len = getLength();

+	if( text_len <= 0 )

+	{

+		return;

+	}

+	S32 selection_left = -1;

+	S32 selection_right = -1;

+	// Draw selection even if we don't have keyboard focus for search/replace

+	if( hasSelection())

+	{

+		selection_left = llmin( mSelectionStart, mSelectionEnd );

+		selection_right = llmax( mSelectionStart, mSelectionEnd );

+	}

+

+	LLRect scrolled_view_rect = getVisibleDocumentRect();

+	std::pair<S32, S32> line_range = getVisibleLines(mClipPartial);

+	S32 first_line = line_range.first;

+	S32 last_line = line_range.second;

+	if (first_line >= last_line)

+	{

+		return;

+	}

+	

+	S32 line_start = getLineStart(first_line);

+	// find first text segment that spans top of visible portion of text buffer

+	segment_set_t::iterator seg_iter = getSegIterContaining(line_start);

+	if (seg_iter == mSegments.end()) 

+	{

+		return;

+	}

+

+	LLTextSegmentPtr cur_segment = *seg_iter;

+

+	for (S32 cur_line = first_line; cur_line < last_line; cur_line++)

+	{

+		S32 next_line = cur_line + 1;

+		line_info& line = mLineInfoList[cur_line];

+

+		S32 next_start = -1;

+		S32 line_end = text_len;

+

+		if (next_line < getLineCount())

+		{

+			next_start = getLineStart(next_line);

+			line_end = next_start;

+		}

+

+		LLRect text_rect(line.mRect.mLeft + mVisibleTextRect.mLeft - scrolled_view_rect.mLeft,

+						line.mRect.mTop - scrolled_view_rect.mBottom + mVisibleTextRect.mBottom,

+						llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft,

+						line.mRect.mBottom - scrolled_view_rect.mBottom + mVisibleTextRect.mBottom);

+

+		// draw a single line of text

+		S32 seg_start = line_start;

+		while( seg_start < line_end )

+		{

+			while( cur_segment->getEnd() <= seg_start )

+			{

+				seg_iter++;

+				if (seg_iter == mSegments.end())

+				{

+					llwarns << "Ran off the segmentation end!" << llendl;

+

+					return;

+				}

+				cur_segment = *seg_iter;

+			}

+			

+			S32 clipped_end	=	llmin( line_end, cur_segment->getEnd() )  - cur_segment->getStart();

+

+			if (mUseEllipses								// using ellipses

+				&& clipped_end == line_end					// last segment on line

+				&& next_line == last_line					// this is the last visible line

+				&& last_line < (S32)mLineInfoList.size())	// and there is more text to display

+			{

+				// more lines of text to go, but we can't fit them

+				// so shrink text rect to force ellipses

+				text_rect.mRight -= 2;

+			}

+

+			text_rect.mLeft = (S32)(cur_segment->draw(seg_start - cur_segment->getStart(), clipped_end, selection_left, selection_right, text_rect));

+

+			seg_start = clipped_end + cur_segment->getStart();

+		}

+

+		line_start = next_start;

+	}

+}

+

+///////////////////////////////////////////////////////////////////

+// Returns change in number of characters in mWText

+

+S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::segment_vec_t* segments )

+{

+	LLWString text(getWText());

+	S32 old_len = text.length();		// length() returns character length

+	S32 insert_len = wstr.length();

+

+	pos = getEditableIndex(pos, true);

+

+	segment_set_t::iterator seg_iter = getSegIterContaining(pos);

+

+	LLTextSegmentPtr default_segment;

+

+	LLTextSegmentPtr segmentp;

+	if (seg_iter != mSegments.end())

+	{

+		segmentp = *seg_iter;

+	}

+	else

+	{

+		//segmentp = mSegments.back();

+		return pos;

+	}

+

+	if (segmentp->canEdit())

+	{

+		segmentp->setEnd(segmentp->getEnd() + insert_len);

+		if (seg_iter != mSegments.end())

+		{

+			++seg_iter;

+		}

+	}

+	else

+	{

+		// create default editable segment to hold new text

+		LLStyleConstSP sp(new LLStyle(getDefaultStyleParams()));

+		default_segment = new LLNormalTextSegment( sp, pos, pos + insert_len, *this);

+	}

+

+	// shift remaining segments to right

+	for(;seg_iter != mSegments.end(); ++seg_iter)

+	{

+		LLTextSegmentPtr segmentp = *seg_iter;

+		segmentp->setStart(segmentp->getStart() + insert_len);

+		segmentp->setEnd(segmentp->getEnd() + insert_len);

+	}

+

+	// insert new segments

+	if (segments)

+	{

+		if (default_segment.notNull())

+		{

+			// potentially overwritten by segments passed in

+			insertSegment(default_segment);

+		}

+		for (segment_vec_t::iterator seg_iter = segments->begin();

+			seg_iter != segments->end();

+			++seg_iter)

+		{

+			LLTextSegment* segmentp = *seg_iter;

+			insertSegment(segmentp);

+		}

+	}

+

+	text.insert(pos, wstr);

+    getViewModel()->setDisplay(text);

+

+	if ( truncate() )

+	{

+		insert_len = getLength() - old_len;

+	}

+

+	onValueChange(pos, pos + insert_len);

+	needsReflow(pos);

+

+	return insert_len;

+}

+

+S32 LLTextBase::removeStringNoUndo(S32 pos, S32 length)

+{

+    LLWString text(getWText());

+	segment_set_t::iterator seg_iter = getSegIterContaining(pos);

+	while(seg_iter != mSegments.end())

+	{

+		LLTextSegmentPtr segmentp = *seg_iter;

+		S32 end = pos + length;

+		if (segmentp->getStart() < pos)

+		{

+			// deleting from middle of segment

+			if (segmentp->getEnd() > end)

+			{

+				segmentp->setEnd(segmentp->getEnd() - length);

+			}

+			// truncating segment

+			else

+			{

+				segmentp->setEnd(pos);

+			}

+		}

+		else if (segmentp->getStart() < end)

+		{

+			// deleting entire segment

+			if (segmentp->getEnd() <= end)

+			{

+				// remove segment

+				segmentp->unlinkFromDocument(this);

+				segment_set_t::iterator seg_to_erase(seg_iter++);

+				mSegments.erase(seg_to_erase);

+				continue;

+			}

+			// deleting head of segment

+			else

+			{

+				segmentp->setStart(pos);

+				segmentp->setEnd(segmentp->getEnd() - length);

+			}

+		}

+		else

+		{

+			// shifting segments backward to fill deleted portion

+			segmentp->setStart(segmentp->getStart() - length);

+			segmentp->setEnd(segmentp->getEnd() - length);

+		}

+		++seg_iter;

+	}

+

+	text.erase(pos, length);

+    getViewModel()->setDisplay(text);

+

+	// recreate default segment in case we erased everything

+	createDefaultSegment();

+

+	onValueChange(pos, pos);

+	needsReflow(pos);

+

+	return -length;	// This will be wrong if someone calls removeStringNoUndo with an excessive length

+}

+

+S32 LLTextBase::overwriteCharNoUndo(S32 pos, llwchar wc)

+{

+	if (pos > (S32)getLength())

+	{

+		return 0;

+	}

+    LLWString text(getWText());

+	text[pos] = wc;

+    getViewModel()->setDisplay(text);

+

+	onValueChange(pos, pos + 1);

+	needsReflow(pos);

+

+	return 1;

+}

+

+

+void LLTextBase::createDefaultSegment()

+{

+	// ensures that there is always at least one segment

+	if (mSegments.empty())

+	{

+		LLStyleConstSP sp(new LLStyle(getDefaultStyleParams()));

+		LLTextSegmentPtr default_segment = new LLNormalTextSegment( sp, 0, getLength() + 1, *this);

+		mSegments.insert(default_segment);

+		default_segment->linkToDocument(this);

+	}

+}

+

+void LLTextBase::insertSegment(LLTextSegmentPtr segment_to_insert)

+{

+	if (segment_to_insert.isNull()) 

+	{

+		return;

+	}

+

+	segment_set_t::iterator cur_seg_iter = getSegIterContaining(segment_to_insert->getStart());

+	S32 reflow_start_index = 0;

+

+	if (cur_seg_iter == mSegments.end())

+	{

+		mSegments.insert(segment_to_insert);

+		segment_to_insert->linkToDocument(this);

+		reflow_start_index = segment_to_insert->getStart();

+	}

+	else

+	{

+		LLTextSegmentPtr cur_segmentp = *cur_seg_iter;

+		reflow_start_index = cur_segmentp->getStart();

+		if (cur_segmentp->getStart() < segment_to_insert->getStart())

+		{

+			S32 old_segment_end = cur_segmentp->getEnd();

+			// split old at start point for new segment

+			cur_segmentp->setEnd(segment_to_insert->getStart());

+			// advance to next segment

+			// insert remainder of old segment

+			LLStyleConstSP sp = cur_segmentp->getStyle();

+			LLTextSegmentPtr remainder_segment = new LLNormalTextSegment( sp, segment_to_insert->getStart(), old_segment_end, *this);

+			mSegments.insert(cur_seg_iter, remainder_segment);

+			remainder_segment->linkToDocument(this);

+			// insert new segment before remainder of old segment

+			mSegments.insert(cur_seg_iter, segment_to_insert);

+

+			segment_to_insert->linkToDocument(this);

+			// at this point, there will be two overlapping segments owning the text

+			// associated with the incoming segment

+		}

+		else

+		{

+			mSegments.insert(cur_seg_iter, segment_to_insert);

+			segment_to_insert->linkToDocument(this);

+		}

+

+		// now delete/truncate remaining segments as necessary

+		// cur_seg_iter points to segment before incoming segment

+		while(cur_seg_iter != mSegments.end())

+		{

+			cur_segmentp = *cur_seg_iter;

+			if (cur_segmentp == segment_to_insert) 

+			{

+				++cur_seg_iter;

+				continue;

+			}

+

+			if (cur_segmentp->getStart() >= segment_to_insert->getStart())

+			{

+				if(cur_segmentp->getEnd() <= segment_to_insert->getEnd())

+				{

+					cur_segmentp->unlinkFromDocument(this);

+					// grab copy of iterator to erase, and bump it

+					segment_set_t::iterator seg_to_erase(cur_seg_iter++);

+					mSegments.erase(seg_to_erase);

+					continue;

+				}

+				else

+				{

+					// last overlapping segment, clip to end of incoming segment

+					// and stop traversal

+					cur_segmentp->setStart(segment_to_insert->getEnd());

+					break;

+				}

+			}

+			++cur_seg_iter;

+		}

+	}

+

+	// layout potentially changed

+	needsReflow(reflow_start_index);

+}

+

+BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleMouseDown(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleMouseDown(x, y, mask);

+}

+

+BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleMouseUp(x, y, mask))

+	{

+		// Did we just click on a link?

+		if (cur_segment->getStyle()

+		    && cur_segment->getStyle()->isLink())

+		{

+			// *TODO: send URL here?

+			mURLClickSignal(this, LLSD() );

+		}

+		return TRUE;

+	}

+

+	return LLUICtrl::handleMouseUp(x, y, mask);

+}

+

+BOOL LLTextBase::handleMiddleMouseDown(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleMiddleMouseDown(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleMiddleMouseDown(x, y, mask);

+}

+

+BOOL LLTextBase::handleMiddleMouseUp(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleMiddleMouseUp(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleMiddleMouseUp(x, y, mask);

+}

+

+BOOL LLTextBase::handleRightMouseDown(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleRightMouseDown(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleRightMouseDown(x, y, mask);

+}

+

+BOOL LLTextBase::handleRightMouseUp(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleRightMouseUp(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleRightMouseUp(x, y, mask);

+}

+

+BOOL LLTextBase::handleDoubleClick(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleDoubleClick(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleDoubleClick(x, y, mask);

+}

+

+BOOL LLTextBase::handleHover(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleHover(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleHover(x, y, mask);

+}

+

+BOOL LLTextBase::handleScrollWheel(S32 x, S32 y, S32 clicks)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleScrollWheel(x, y, clicks))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleScrollWheel(x, y, clicks);

+}

+

+BOOL LLTextBase::handleToolTip(S32 x, S32 y, MASK mask)

+{

+	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);

+	if (cur_segment && cur_segment->handleToolTip(x, y, mask))

+	{

+		return TRUE;

+	}

+

+	return LLUICtrl::handleToolTip(x, y, mask);

+}

+

+

+void LLTextBase::reshape(S32 width, S32 height, BOOL called_from_parent)

+{

+	if (width != getRect().getWidth() || height != getRect().getHeight())

+	{

+		bool scrolled_to_bottom = mScroller ? mScroller->isAtBottom() : false;

+		

+		LLUICtrl::reshape( width, height, called_from_parent );

+	

+		if (mScroller && scrolled_to_bottom && mTrackEnd)

+		{

+			// keep bottom of text buffer visible

+			// do this here as well as in reflow to handle case

+			// where shrinking from top, which causes buffer to temporarily 

+			// not be scrolled to the bottom, since the scroll index

+			// specified the _top_ of the visible document region

+			mScroller->goToBottom();

+		}		

+

+		// do this first after reshape, because other things depend on

+		// up-to-date mVisibleTextRect

+		updateRects();

+		

+		needsReflow();

+	}

+}

+

+void LLTextBase::draw()

+{

+	// reflow if needed, on demand

+	reflow();

+

+	// then update scroll position, as cursor may have moved

+	if (!mReadOnly)

+	{

+		updateScrollFromCursor();

+	}

+

+	LLRect doc_rect;

+	if (mScroller)

+	{

+		mScroller->localRectToOtherView(mScroller->getContentWindowRect(), &doc_rect, this);

+	}

+	else

+	{

+		doc_rect = getLocalRect();

+	}

+

+	if (mBGVisible)

+	{

+		// clip background rect against extents, if we support scrolling

+		LLLocalClipRect clip(doc_rect, mScroller != NULL);

+

+		LLColor4 bg_color = mReadOnly 

+							? mReadOnlyBgColor.get()

+							: hasFocus() 

+								? mFocusBgColor.get() 

+								: mWriteableBgColor.get();

+		gl_rect_2d(mVisibleTextRect, bg_color, TRUE);

+	}

+

+	// draw document view

+	LLUICtrl::draw();

+

+	{

+		// only clip if we support scrolling (mScroller != NULL)

+		LLLocalClipRect clip(doc_rect, mScroller != NULL);

+		drawSelectionBackground();

+		drawText();

+		drawCursor();

+	}

+}

+

+

+//virtual

+void LLTextBase::setColor( const LLColor4& c )

+{

+	mFgColor = c;

+}

+

+//virtual 

+void LLTextBase::setReadOnlyColor(const LLColor4 &c)

+{

+	mReadOnlyFgColor = c;

+}

+

+//virtual

+void LLTextBase::handleVisibilityChange( BOOL new_visibility )

+{

+	if(!new_visibility && mPopupMenu)

+	{

+		mPopupMenu->hide();

+	}

+	LLUICtrl::handleVisibilityChange(new_visibility);

+}

+

+//virtual

+void LLTextBase::setValue(const LLSD& value )

+{

+	setText(value.asString());

+}

+

+//virtual

+BOOL LLTextBase::canDeselect() const 

+{ 

+	return hasSelection(); 

+}

+

+

+//virtual

+void LLTextBase::deselect()

+{

+	mSelectionStart = 0;

+	mSelectionEnd = 0;

+	mIsSelecting = FALSE;

+}

+

+

+// Sets the scrollbar from the cursor position

+void LLTextBase::updateScrollFromCursor()

+{

+	// Update scroll position even in read-only mode (when there's no cursor displayed)

+	// because startOfDoc()/endOfDoc() modify cursor position. See EXT-736.

+

+	if (!mScrollNeeded || !mScroller)

+	{

+		return;

+	}

+	mScrollNeeded = FALSE; 

+

+	// scroll so that the cursor is at the top of the page

+	LLRect scroller_doc_window = getVisibleDocumentRect();

+	LLRect cursor_rect_doc = getLocalRectFromDocIndex(mCursorPos);

+	cursor_rect_doc.translate(scroller_doc_window.mLeft, scroller_doc_window.mBottom);

+	mScroller->scrollToShowRect(cursor_rect_doc, LLRect(0, scroller_doc_window.getHeight() - 5, scroller_doc_window.getWidth(), 5));

+}

+

+S32 LLTextBase::getLeftOffset(S32 width)

+{

+	switch (mHAlign)

+	{

+	case LLFontGL::LEFT:

+		return mHPad;

+	case LLFontGL::HCENTER:

+		return mHPad + llmax(0, (mVisibleTextRect.getWidth() - width - mHPad) / 2);

+	case LLFontGL::RIGHT:

+		return mVisibleTextRect.getWidth() - width;

+	default:

+		return mHPad;

+	}

+}

+

+

+static LLFastTimer::DeclareTimer FTM_TEXT_REFLOW ("Text Reflow");

+void LLTextBase::reflow()

+{

+	LLFastTimer ft(FTM_TEXT_REFLOW);

+

+	updateSegments();

+

+	if (mReflowIndex == S32_MAX)

+	{

+		return;

+	}

+

+	bool scrolled_to_bottom = mScroller ? mScroller->isAtBottom() : false;

+

+	LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);

+	bool follow_selection = getLocalRect().overlaps(cursor_rect); // cursor is (potentially) visible

+

+	// store in top-left relative coordinates to avoid issues with horizontal scrollbar appearing and disappearing

+	cursor_rect.mTop = mVisibleTextRect.mTop - cursor_rect.mTop;

+	cursor_rect.mBottom = mVisibleTextRect.mTop - cursor_rect.mBottom;

+

+	S32 first_line = getFirstVisibleLine();

+

+	// if scroll anchor not on first line, update it to first character of first line

+	if (!mLineInfoList.empty()

+		&&	(mScrollIndex <  mLineInfoList[first_line].mDocIndexStart

+			||	mScrollIndex >= mLineInfoList[first_line].mDocIndexEnd))

+	{

+		mScrollIndex = mLineInfoList[first_line].mDocIndexStart;

+	}

+	LLRect first_char_rect = getLocalRectFromDocIndex(mScrollIndex);

+	// store in top-left relative coordinates to avoid issues with horizontal scrollbar appearing and disappearing

+	first_char_rect.mTop = mVisibleTextRect.mTop - first_char_rect.mTop;

+	first_char_rect.mBottom = mVisibleTextRect.mTop - first_char_rect.mBottom;

+

+	S32 reflow_count = 0;

+	while(mReflowIndex < S32_MAX)

+	{

+		// we can get into an infinite loop if the document height does not monotonically increase

+		// with decreasing width (embedded ui elements with alternate layouts).  In that case, 

+		// we want to stop reflowing after 2 iterations.  We use 2, since we need to handle the case

+		// of introducing a vertical scrollbar causing a reflow with less width.  We should also always

+		// use an even number of iterations to avoid user visible oscillation of the layout

+		if(++reflow_count > 2)

+		{

+			lldebugs << "Breaking out of reflow due to possible infinite loop in " << getName() << llendl;

+			break;

+		}

+	

+		S32 start_index = mReflowIndex;

+		mReflowIndex = S32_MAX;

+

+		// shrink document to minimum size (visible portion of text widget)

+		// to force inlined widgets with follows set to shrink

+		mDocumentView->reshape(mVisibleTextRect.getWidth(), mDocumentView->getRect().getHeight());

+

+		S32 cur_top = 0;

+

+		segment_set_t::iterator seg_iter = mSegments.begin();

+		S32 seg_offset = 0;

+		S32 line_start_index = 0;

+		const S32 text_available_width = mVisibleTextRect.getWidth() - mHPad;  // reserve room for margin

+		S32 remaining_pixels = text_available_width;

+		S32 line_count = 0;

+

+		// find and erase line info structs starting at start_index and going to end of document

+		if (!mLineInfoList.empty())

+		{

+			// find first element whose end comes after start_index

+			line_list_t::iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), start_index, line_end_compare());

+			line_start_index = iter->mDocIndexStart;

+			line_count = iter->mLineNum;

+			cur_top = iter->mRect.mTop;

+			getSegmentAndOffset(iter->mDocIndexStart, &seg_iter, &seg_offset);

+			mLineInfoList.erase(iter, mLineInfoList.end());

+		}

+

+		S32 line_height = 0;

+

+		while(seg_iter != mSegments.end())

+		{

+			LLTextSegmentPtr segment = *seg_iter;

+

+			// track maximum height of any segment on this line

+			S32 cur_index = segment->getStart() + seg_offset;

+

+			// ask segment how many character fit in remaining space

+			S32 character_count = segment->getNumChars(getWordWrap() ? llmax(0, remaining_pixels) : S32_MAX,

+														seg_offset, 

+														cur_index - line_start_index, 

+														S32_MAX);

+

+			S32 segment_width, segment_height;

+			bool force_newline = segment->getDimensions(seg_offset, character_count, segment_width, segment_height);

+			// grow line height as necessary based on reported height of this segment

+			line_height = llmax(line_height, segment_height);

+			remaining_pixels -= segment_width;

+

+			seg_offset += character_count;

+

+			S32 last_segment_char_on_line = segment->getStart() + seg_offset;

+

+			S32 text_actual_width = text_available_width - remaining_pixels;

+			S32 text_left = getLeftOffset(text_actual_width);

+			LLRect line_rect(text_left, 

+							cur_top, 

+							text_left + text_actual_width, 

+							cur_top - line_height);

+

+			// if we didn't finish the current segment...

+			if (last_segment_char_on_line < segment->getEnd())

+			{

+				// add line info and keep going

+				mLineInfoList.push_back(line_info(

+											line_start_index, 

+											last_segment_char_on_line, 

+											line_rect, 

+											line_count));

+

+				line_start_index = segment->getStart() + seg_offset;

+				cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels;

+				remaining_pixels = text_available_width;

+				line_height = 0;

+			}

+			// ...just consumed last segment..

+			else if (++segment_set_t::iterator(seg_iter) == mSegments.end())

+			{

+				mLineInfoList.push_back(line_info(

+											line_start_index, 

+											last_segment_char_on_line, 

+											line_rect, 

+											line_count));

+				cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels;

+				break;

+			}

+			// ...or finished a segment and there are segments remaining on this line

+			else

+			{

+				// subtract pixels used and increment segment

+				if (force_newline)

+				{

+					mLineInfoList.push_back(line_info(

+												line_start_index, 

+												last_segment_char_on_line, 

+												line_rect, 

+												line_count));

+					line_start_index = segment->getStart() + seg_offset;

+					cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels;

+					line_height = 0;

+					remaining_pixels = text_available_width;

+				}

+				++seg_iter;

+				seg_offset = 0;

+			}

+			if (force_newline) 

+			{

+				line_count++;

+			}

+		}

+

+		// calculate visible region for diplaying text

+		updateRects();

+

+		for (segment_set_t::iterator segment_it = mSegments.begin();

+			segment_it != mSegments.end();

+			++segment_it)

+		{

+			LLTextSegmentPtr segmentp = *segment_it;

+			segmentp->updateLayout(*this);

+

+		}

+	}

+

+		// apply scroll constraints after reflowing text

+		if (!hasMouseCapture() && mScroller)

+		{

+			if (scrolled_to_bottom && mTrackEnd)

+			{

+				// keep bottom of text buffer visible

+				endOfDoc();

+			}

+			else if (hasSelection() && follow_selection)

+			{

+				// keep cursor in same vertical position on screen when selecting text

+				LLRect new_cursor_rect_doc = getDocRectFromDocIndex(mCursorPos);

+			LLRect old_cursor_rect = cursor_rect;

+			old_cursor_rect.mTop = mVisibleTextRect.mTop - cursor_rect.mTop;

+			old_cursor_rect.mBottom = mVisibleTextRect.mTop - cursor_rect.mBottom;

+

+				mScroller->scrollToShowRect(new_cursor_rect_doc, old_cursor_rect);

+			}

+			else

+			{

+				// keep first line of text visible

+				LLRect new_first_char_rect = getDocRectFromDocIndex(mScrollIndex);

+

+			// pass in desired rect in the coordinate frame of the document viewport

+			LLRect old_first_char_rect = first_char_rect;

+			old_first_char_rect.mTop = mVisibleTextRect.mTop - first_char_rect.mTop;

+			old_first_char_rect.mBottom = mVisibleTextRect.mTop - first_char_rect.mBottom;

+

+			mScroller->scrollToShowRect(new_first_char_rect, old_first_char_rect);

+			}

+		}

+

+		// reset desired x cursor position

+		updateCursorXPos();

+	}

+

+LLRect LLTextBase::getTextBoundingRect()

+{

+	reflow();

+	return mTextBoundingRect;

+}

+

+

+void LLTextBase::clearSegments()

+{

+	mSegments.clear();

+	createDefaultSegment();

+}

+

+S32 LLTextBase::getLineStart( S32 line ) const

+{

+	S32 num_lines = getLineCount();

+	if (num_lines == 0)

+    {

+		return 0;

+    }

+

+	line = llclamp(line, 0, num_lines-1);

+	return mLineInfoList[line].mDocIndexStart;

+}

+

+S32 LLTextBase::getLineEnd( S32 line ) const

+{

+	S32 num_lines = getLineCount();

+	if (num_lines == 0)

+    {

+		return 0;

+    }

+

+	line = llclamp(line, 0, num_lines-1);

+	return mLineInfoList[line].mDocIndexEnd;

+}

+

+

+

+S32 LLTextBase::getLineNumFromDocIndex( S32 doc_index, bool include_wordwrap) const

+{

+	if (mLineInfoList.empty())

+	{

+		return 0;

+	}

+	else

+	{

+		line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), doc_index, line_end_compare());

+		if (include_wordwrap)

+		{

+			return iter - mLineInfoList.begin();

+		}

+		else

+		{

+			if (iter == mLineInfoList.end())

+			{

+				return mLineInfoList.back().mLineNum;

+			}

+			else

+			{

+				return iter->mLineNum;

+			}

+		}

+	}

+}

+

+// Given an offset into text (pos), find the corresponding line (from the start of the doc) and an offset into the line.

+S32 LLTextBase::getLineOffsetFromDocIndex( S32 startpos, bool include_wordwrap) const

+{

+	if (mLineInfoList.empty())

+	{

+		return startpos;

+	}

+	else

+	{

+		line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), startpos, line_end_compare());

+		return startpos - iter->mDocIndexStart;

+	}

+}

+

+S32	LLTextBase::getFirstVisibleLine() const

+{

+	LLRect visible_region = getVisibleDocumentRect();

+

+	// binary search for line that starts before top of visible buffer

+	line_list_t::const_iterator iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_bottom());

+

+	return iter - mLineInfoList.begin();

+}

+

+std::pair<S32, S32>	LLTextBase::getVisibleLines(bool fully_visible) 

+{

+	LLRect visible_region = getVisibleDocumentRect();

+	line_list_t::const_iterator first_iter;

+	line_list_t::const_iterator last_iter;

+

+	// make sure we have an up-to-date mLineInfoList

+	reflow();

+

+	if (fully_visible)

+	{

+		first_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_top());

+		last_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mBottom, compare_bottom());

+	}

+	else

+	{

+		first_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mTop, compare_bottom());

+		last_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), visible_region.mBottom, compare_top());

+	}

+	return std::pair<S32, S32>(first_iter - mLineInfoList.begin(), last_iter - mLineInfoList.begin());

+}

+

+

+

+LLTextViewModel* LLTextBase::getViewModel() const

+{

+	return (LLTextViewModel*)mViewModel.get();

+}

+

+void LLTextBase::addDocumentChild(LLView* view) 

+{ 

+	mDocumentView->addChild(view); 

+}

+

+void LLTextBase::removeDocumentChild(LLView* view) 

+{ 

+	mDocumentView->removeChild(view); 

+}

+

+

+static LLFastTimer::DeclareTimer FTM_UPDATE_TEXT_SEGMENTS("Update Text Segments");

+void LLTextBase::updateSegments()

+{

+	LLFastTimer ft(FTM_UPDATE_TEXT_SEGMENTS);

+	createDefaultSegment();

+}

+

+void LLTextBase::getSegmentAndOffset( S32 startpos, segment_set_t::const_iterator* seg_iter, S32* offsetp ) const

+{

+	*seg_iter = getSegIterContaining(startpos);

+	if (*seg_iter == mSegments.end())

+	{

+		*offsetp = 0;

+	}

+	else

+	{

+		*offsetp = startpos - (**seg_iter)->getStart();

+	}

+}

+

+void LLTextBase::getSegmentAndOffset( S32 startpos, segment_set_t::iterator* seg_iter, S32* offsetp )

+{

+	*seg_iter = getSegIterContaining(startpos);

+	if (*seg_iter == mSegments.end())

+	{

+		*offsetp = 0;

+	}

+	else

+	{

+		*offsetp = startpos - (**seg_iter)->getStart();

+	}

+}

+

+LLTextBase::segment_set_t::iterator LLTextBase::getSegIterContaining(S32 index)

+{

+	segment_set_t::iterator it = mSegments.upper_bound(new LLIndexSegment(index));

+	return it;

+}

+

+LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 index) const

+{

+	LLTextBase::segment_set_t::const_iterator it =  mSegments.upper_bound(new LLIndexSegment(index));

+	return it;

+}

+

+// Finds the text segment (if any) at the give local screen position

+LLTextSegmentPtr LLTextBase::getSegmentAtLocalPos( S32 x, S32 y, bool hit_past_end_of_line)

+{

+	// Find the cursor position at the requested local screen position

+	S32 offset = getDocIndexFromLocalCoord( x, y, FALSE, hit_past_end_of_line);

+	segment_set_t::iterator seg_iter = getSegIterContaining(offset);

+	if (seg_iter != mSegments.end())

+	{

+		return *seg_iter;

+	}

+	else

+	{

+		return LLTextSegmentPtr();

+	}

+}

+

+void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url)

+{

+	// work out the XUI menu file to use for this url

+	LLUrlMatch match;

+	std::string url = in_url;

+	if (! LLUrlRegistry::instance().findUrl(url, match))

+	{

+		return;

+	}

+	

+	std::string xui_file = match.getMenuName();

+	if (xui_file.empty())

+	{

+		return;

+	}

+

+	// set up the callbacks for all of the potential menu items, N.B. we

+	// don't use const ref strings in callbacks in case url goes out of scope

+	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;

+	registrar.add("Url.Open", boost::bind(&LLUrlAction::openURL, url));

+	registrar.add("Url.OpenInternal", boost::bind(&LLUrlAction::openURLInternal, url));

+	registrar.add("Url.OpenExternal", boost::bind(&LLUrlAction::openURLExternal, url));

+	registrar.add("Url.Execute", boost::bind(&LLUrlAction::executeSLURL, url));

+	registrar.add("Url.Teleport", boost::bind(&LLUrlAction::teleportToLocation, url));

+	registrar.add("Url.ShowProfile", boost::bind(&LLUrlAction::showProfile, url));

+	registrar.add("Url.ShowOnMap", boost::bind(&LLUrlAction::showLocationOnMap, url));

+	registrar.add("Url.CopyLabel", boost::bind(&LLUrlAction::copyLabelToClipboard, url));

+	registrar.add("Url.CopyUrl", boost::bind(&LLUrlAction::copyURLToClipboard, url));

+

+	// create and return the context menu from the XUI file

+	delete mPopupMenu;

+	mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>(xui_file, LLMenuGL::sMenuContainer,

+																		 LLMenuHolderGL::child_registry_t::instance());	

+	if (mPopupMenu)

+	{

+		mPopupMenu->show(x, y);

+		LLMenuGL::showPopup(this, mPopupMenu, x, y);

+	}

+}

+

+void LLTextBase::setText(const LLStringExplicit &utf8str, const LLStyle::Params& input_params)

+{

+	// clear out the existing text and segments

+	getViewModel()->setDisplay(LLWStringUtil::null);

+

+	clearSegments();

+//	createDefaultSegment();

+

+	deselect();

+

+	// append the new text (supports Url linking)

+	std::string text(utf8str);

+	LLStringUtil::removeCRLF(text);

+

+	// appendText modifies mCursorPos...

+	appendText(text, false, input_params);

+	// ...so move cursor to top after appending text

+	startOfDoc();

+

+	onValueChange(0, getLength());

+}

+

+//virtual

+std::string LLTextBase::getText() const

+{

+	return getViewModel()->getValue().asString();

+}

+

+// IDEVO - icons can be UI image names or UUID sent from

+// server with avatar display name

+static LLUIImagePtr image_from_icon_name(const std::string& icon_name)

+{

+	if (LLUUID::validate(icon_name))

+	{

+		return LLUI::getUIImageByID( LLUUID(icon_name) );

+	}

+	else

+	{

+		return LLUI::getUIImage(icon_name);

+	}

+}

+

+void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params)

+{

+	LLStyle::Params style_params(input_params);

+	style_params.fillFrom(getDefaultStyleParams());

+

+	S32 part = (S32)LLTextParser::WHOLE;

+	if(mParseHTML)

+	{

+		S32 start=0,end=0;

+		LLUrlMatch match;

+		std::string text = new_text;

+		while ( LLUrlRegistry::instance().findUrl(text, match,

+		        boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3)) )

+		{

+			

+			LLTextUtil::processUrlMatch(&match,this);

+

+			start = match.getStart();

+			end = match.getEnd()+1;

+

+			LLStyle::Params link_params(style_params);

+			link_params.overwriteFrom(match.getStyle());

+

+			// output the text before the Url

+			if (start > 0)

+			{

+				if (part == (S32)LLTextParser::WHOLE ||

+					part == (S32)LLTextParser::START)

+				{

+					part = (S32)LLTextParser::START;

+				}

+				else

+				{

+					part = (S32)LLTextParser::MIDDLE;

+				}

+				std::string subtext=text.substr(0,start);

+				appendAndHighlightText(subtext, part, style_params); 

+			}

+

+			// output the styled Url

+			appendAndHighlightTextImpl(match.getLabel(), part, link_params);

+			

+			// set the tooltip for the Url label

+			if (! match.getTooltip().empty())

+			{

+				segment_set_t::iterator it = getSegIterContaining(getLength()-1);

+				if (it != mSegments.end())

+					{

+						LLTextSegmentPtr segment = *it;

+						segment->setToolTip(match.getTooltip());

+					}

+			}

+

+			// move on to the rest of the text after the Url

+			if (end < (S32)text.length()) 

+			{

+				text = text.substr(end,text.length() - end);

+				end=0;

+				part=(S32)LLTextParser::END;

+			}

+			else

+			{

+				break;

+			}

+		}

+		if (part != (S32)LLTextParser::WHOLE) 

+			part=(S32)LLTextParser::END;

+		if (end < (S32)text.length()) 

+			appendAndHighlightText(text, part, style_params);		

+	}

+	else

+	{

+		appendAndHighlightText(new_text, part, style_params);

+	}

+}

+

+void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, const LLStyle::Params& input_params)

+{

+	if (new_text.empty()) 

+		return;

+

+	if(prepend_newline)

+		appendLineBreakSegment(input_params);

+	appendTextImpl(new_text,input_params);

+}

+

+void LLTextBase::needsReflow(S32 index)

+{

+	lldebugs << "reflow on object " << (void*)this << " index = " << mReflowIndex << ", new index = " << index << llendl;

+	mReflowIndex = llmin(mReflowIndex, index);

+}

+

+void LLTextBase::appendLineBreakSegment(const LLStyle::Params& style_params)

+{

+	segment_vec_t segments;

+	LLStyleConstSP sp(new LLStyle(style_params));

+	segments.push_back(new LLLineBreakTextSegment(sp, getLength()));

+

+	insertStringNoUndo(getLength(), utf8str_to_wstring("\n"), &segments);

+}

+

+void LLTextBase::appendImageSegment(const LLStyle::Params& style_params)

+{

+	if(getPlainText())

+	{

+		return;

+	}

+	segment_vec_t segments;

+	LLStyleConstSP sp(new LLStyle(style_params));

+	segments.push_back(new LLImageTextSegment(sp, getLength(),*this));

+

+	insertStringNoUndo(getLength(), utf8str_to_wstring(" "), &segments);

+}

+

+void LLTextBase::appendWidget(const LLInlineViewSegment::Params& params, const std::string& text, bool allow_undo)

+{

+	segment_vec_t segments;

+	LLWString widget_wide_text = utf8str_to_wstring(text);

+	segments.push_back(new LLInlineViewSegment(params, getLength(), getLength() + widget_wide_text.size()));

+

+	insertStringNoUndo(getLength(), widget_wide_text, &segments);

+}

+

+void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params)

+{

+	// Save old state

+	S32 selection_start = mSelectionStart;

+	S32 selection_end = mSelectionEnd;

+	BOOL was_selecting = mIsSelecting;

+	S32 cursor_pos = mCursorPos;

+	S32 old_length = getLength();

+	BOOL cursor_was_at_end = (mCursorPos == old_length);

+

+	deselect();

+

+	setCursorPos(old_length);

+

+	if (mParseHighlights)

+	{

+		LLStyle::Params highlight_params(style_params);

+

+		LLSD pieces = LLTextParser::instance().parsePartialLineHighlights(new_text, highlight_params.color(), (LLTextParser::EHighlightPosition)highlight_part);

+		for (S32 i = 0; i < pieces.size(); i++)

+		{

+			LLSD color_llsd = pieces[i]["color"];

+			LLColor4 lcolor;

+			lcolor.setValue(color_llsd);

+			highlight_params.color = lcolor;

+

+			LLWString wide_text;

+				wide_text = utf8str_to_wstring(pieces[i]["text"].asString());

+

+			S32 cur_length = getLength();

+			LLStyleConstSP sp(new LLStyle(highlight_params));

+			LLTextSegmentPtr segmentp = new LLNormalTextSegment(sp, cur_length, cur_length + wide_text.size(), *this);

+			segment_vec_t segments;

+			segments.push_back(segmentp);

+			insertStringNoUndo(cur_length, wide_text, &segments);

+		}

+	}

+	else

+	{

+		LLWString wide_text;

+			wide_text = utf8str_to_wstring(new_text);

+

+		segment_vec_t segments;

+		S32 segment_start = old_length;

+		S32 segment_end = old_length + wide_text.size();

+		LLStyleConstSP sp(new LLStyle(style_params));

+		segments.push_back(new LLNormalTextSegment(sp, segment_start, segment_end, *this ));

+

+		insertStringNoUndo(getLength(), wide_text, &segments);

+	}

+

+	// Set the cursor and scroll position

+	if( selection_start != selection_end )

+	{

+		mSelectionStart = selection_start;

+		mSelectionEnd = selection_end;

+

+		mIsSelecting = was_selecting;

+		setCursorPos(cursor_pos);

+	}

+	else if( cursor_was_at_end )

+	{

+		setCursorPos(getLength());

+	}

+	else

+	{

+		setCursorPos(cursor_pos);

+	}

+}

+

+void LLTextBase::appendAndHighlightText(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params)

+{

+	if (new_text.empty()) return; 

+

+	std::string::size_type start = 0;

+	std::string::size_type pos = new_text.find("\n",start);

+	

+	while(pos!=-1)

+	{

+		if(pos!=start)

+		{

+			std::string str = std::string(new_text,start,pos-start);

+			appendAndHighlightTextImpl(str,highlight_part, style_params);

+		}

+		appendLineBreakSegment(style_params);

+		start = pos+1;

+		pos = new_text.find("\n",start);

+	}

+

+	std::string str = std::string(new_text,start,new_text.length()-start);

+	appendAndHighlightTextImpl(str,highlight_part, style_params);

+}

+

+

+void LLTextBase::replaceUrl(const std::string &url,

+							const std::string &label,

+							const std::string &icon)

+{

+	// get the full (wide) text for the editor so we can change it

+	LLWString text = getWText();

+	LLWString wlabel = utf8str_to_wstring(label);

+	bool modified = false;

+	S32 seg_start = 0;

+

+	// iterate through each segment looking for ones styled as links

+	segment_set_t::iterator it;

+	for (it = mSegments.begin(); it != mSegments.end(); ++it)

+	{

+		LLTextSegment *seg = *it;

+		LLStyleConstSP style = seg->getStyle();

+

+		// update segment start/end length in case we replaced text earlier

+		S32 seg_length = seg->getEnd() - seg->getStart();

+		seg->setStart(seg_start);

+		seg->setEnd(seg_start + seg_length);

+

+		// if we find a link with our Url, then replace the label

+		if (style->getLinkHREF() == url)

+		{

+			S32 start = seg->getStart();

+			S32 end = seg->getEnd();

+			text = text.substr(0, start) + wlabel + text.substr(end, text.size() - end + 1);

+			seg->setEnd(start + wlabel.size());

+			modified = true;

+		}

+

+		// Icon might be updated when more avatar or group info

+		// becomes available

+		if (style->isImage() && style->getLinkHREF() == url)

+		{

+			LLUIImagePtr image = image_from_icon_name( icon );

+			if (image)

+			{

+				LLStyle::Params icon_params;

+				icon_params.image = image;

+				LLStyleConstSP new_style(new LLStyle(icon_params));

+				seg->setStyle(new_style);

+				modified = true;

+			}

+		}

+

+		// work out the character offset for the next segment

+		seg_start = seg->getEnd();

+	}

+

+	// update the editor with the new (wide) text string

+	if (modified)

+	{

+		getViewModel()->setDisplay(text);

+		deselect();

+		setCursorPos(mCursorPos);

+		needsReflow();

+	}

+}

+

+

+void LLTextBase::setWText(const LLWString& text)

+{

+	setText(wstring_to_utf8str(text));

+}

+

+const LLWString& LLTextBase::getWText() const

+{

+    return getViewModel()->getDisplay();

+}

+

+// If round is true, if the position is on the right half of a character, the cursor

+// will be put to its right.  If round is false, the cursor will always be put to the

+// character's left.

+

+S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, bool hit_past_end_of_line) const

+{

+	// Figure out which line we're nearest to.

+	LLRect visible_region = getVisibleDocumentRect();

+	

+	// binary search for line that starts before local_y

+	line_list_t::const_iterator line_iter = std::lower_bound(mLineInfoList.begin(), mLineInfoList.end(), local_y - mVisibleTextRect.mBottom + visible_region.mBottom, compare_bottom());

+

+	if (line_iter == mLineInfoList.end())

+	{

+		return getLength(); // past the end

+	}

+	

+	S32 pos = getLength();

+	S32 start_x = mVisibleTextRect.mLeft + line_iter->mRect.mLeft - visible_region.mLeft;

+

+	segment_set_t::iterator line_seg_iter;

+	S32 line_seg_offset;

+	for(getSegmentAndOffset(line_iter->mDocIndexStart, &line_seg_iter, &line_seg_offset);

+		line_seg_iter != mSegments.end(); 

+		++line_seg_iter, line_seg_offset = 0)

+	{

+		const LLTextSegmentPtr segmentp = *line_seg_iter;

+

+		S32 segment_line_start = segmentp->getStart() + line_seg_offset;

+		S32 segment_line_length = llmin(segmentp->getEnd(), line_iter->mDocIndexEnd) - segment_line_start;

+		S32 text_width, text_height;

+		bool newline = segmentp->getDimensions(line_seg_offset, segment_line_length, text_width, text_height);

+

+		if(newline)

+		{

+			pos = segment_line_start + segmentp->getOffset(local_x - start_x, line_seg_offset, segment_line_length, round);

+			break;

+		}

+

+		// if we've reached a line of text *below* the mouse cursor, doc index is first character on that line

+		if (hit_past_end_of_line && local_y - mVisibleTextRect.mBottom + visible_region.mBottom > line_iter->mRect.mTop)

+		{

+			pos = segment_line_start;

+			break;

+		}

+		if (local_x < start_x + text_width)			// cursor to left of right edge of text

+		{

+			// Figure out which character we're nearest to.

+			S32 offset;

+			if (!segmentp->canEdit())

+			{

+				S32 segment_width, segment_height;

+				segmentp->getDimensions(0, segmentp->getEnd() - segmentp->getStart(), segment_width, segment_height);

+				if (round && local_x - start_x > segment_width / 2)

+				{

+					offset = segment_line_length;

+				}

+				else

+				{

+					offset = 0;

+				}

+			}

+			else

+			{

+				offset = segmentp->getOffset(local_x - start_x, line_seg_offset, segment_line_length, round);

+			}

+			pos = segment_line_start + offset;

+			break;

+		}

+		else if (hit_past_end_of_line && segmentp->getEnd() > line_iter->mDocIndexEnd - 1)	

+		{

+			// segment wraps to next line, so just set doc pos to the end of the line

+			// segment wraps to next line, so just set doc pos to start of next line (represented by mDocIndexEnd)

+			pos = llmin(getLength(), line_iter->mDocIndexEnd);

+			break;

+		}

+		start_x += text_width;

+	}

+

+	return pos;

+}

+

+// returns rectangle of insertion caret 

+// in document coordinate frame from given index into text

+LLRect LLTextBase::getDocRectFromDocIndex(S32 pos) const

+{

+	if (mLineInfoList.empty()) 

+	{ 

+		return LLRect();

+	}

+

+	LLRect doc_rect;

+

+	// clamp pos to valid values

+	pos = llclamp(pos, 0, mLineInfoList.back().mDocIndexEnd - 1);

+

+	// find line that contains cursor

+	line_list_t::const_iterator line_iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), pos, line_end_compare());

+

+	doc_rect.mLeft = line_iter->mRect.mLeft; 

+	doc_rect.mBottom = line_iter->mRect.mBottom;

+	doc_rect.mTop = line_iter->mRect.mTop;

+

+	segment_set_t::iterator line_seg_iter;

+	S32 line_seg_offset;

+	segment_set_t::iterator cursor_seg_iter;

+	S32 cursor_seg_offset;

+	getSegmentAndOffset(line_iter->mDocIndexStart, &line_seg_iter, &line_seg_offset);

+	getSegmentAndOffset(pos, &cursor_seg_iter, &cursor_seg_offset);

+

+	while(line_seg_iter != mSegments.end())

+	{

+		const LLTextSegmentPtr segmentp = *line_seg_iter;

+

+		if (line_seg_iter == cursor_seg_iter)

+		{

+			// cursor advanced to right based on difference in offset of cursor to start of line

+			S32 segment_width, segment_height;

+			segmentp->getDimensions(line_seg_offset, cursor_seg_offset - line_seg_offset, segment_width, segment_height);

+			doc_rect.mLeft += segment_width;

+

+			break;

+		}

+		else

+		{

+			// add remainder of current text segment to cursor position

+			S32 segment_width, segment_height;

+			segmentp->getDimensions(line_seg_offset, (segmentp->getEnd() - segmentp->getStart()) - line_seg_offset, segment_width, segment_height);

+			doc_rect.mLeft += segment_width;

+			// offset will be 0 for all segments after the first

+			line_seg_offset = 0;

+			// go to next text segment on this line

+			++line_seg_iter;

+		}

+	}

+

+	// set rect to 0 width

+	doc_rect.mRight = doc_rect.mLeft; 

+

+	return doc_rect;

+}

+

+LLRect LLTextBase::getLocalRectFromDocIndex(S32 pos) const

+{

+	LLRect content_window_rect = mScroller ? mScroller->getContentWindowRect() : getLocalRect();

+	if (mBorderVisible)

+	{

+		content_window_rect.stretch(-1);

+	}

+

+	LLRect local_rect;

+

+	if (mLineInfoList.empty()) 

+	{ 

+		// return default height rect in upper left

+		local_rect = content_window_rect;

+		local_rect.mBottom = local_rect.mTop - (S32)(mDefaultFont->getLineHeight());

+		return local_rect;

+	}

+

+	// get the rect in document coordinates

+	LLRect doc_rect = getDocRectFromDocIndex(pos);

+

+	// compensate for scrolled, inset view of doc

+	LLRect scrolled_view_rect = getVisibleDocumentRect();

+	local_rect = doc_rect;

+	local_rect.translate(content_window_rect.mLeft - scrolled_view_rect.mLeft, 

+						content_window_rect.mBottom - scrolled_view_rect.mBottom);

+

+	return local_rect;

+}

+

+void LLTextBase::updateCursorXPos()

+{

+	// reset desired x cursor position

+	mDesiredXPixel = getLocalRectFromDocIndex(mCursorPos).mLeft;

+}

+

+

+void LLTextBase::startOfLine()

+{

+	S32 offset = getLineOffsetFromDocIndex(mCursorPos);

+	setCursorPos(mCursorPos - offset);

+}

+

+void LLTextBase::endOfLine()

+{

+	S32 line = getLineNumFromDocIndex(mCursorPos);

+	S32 num_lines = getLineCount();

+	if (line + 1 >= num_lines)

+	{

+		setCursorPos(getLength());

+	}

+	else

+	{

+		setCursorPos( getLineStart(line + 1) - 1 );

+	}

+}

+

+void LLTextBase::startOfDoc()

+{

+	setCursorPos(0);

+	if (mScroller)

+	{

+		mScroller->goToTop();

+	}

+}

+

+void LLTextBase::endOfDoc()

+{

+	setCursorPos(getLength());

+	if (mScroller)

+	{

+		mScroller->goToBottom();

+	}

+}

+

+void LLTextBase::changePage( S32 delta )

+{

+	const S32 PIXEL_OVERLAP_ON_PAGE_CHANGE = 10;

+	if (delta == 0 || !mScroller) return;

+

+	LLRect cursor_rect = getLocalRectFromDocIndex(mCursorPos);

+

+	if( delta == -1 )

+	{

+		mScroller->pageUp(PIXEL_OVERLAP_ON_PAGE_CHANGE);

+	}

+	else

+	if( delta == 1 )

+	{

+		mScroller->pageDown(PIXEL_OVERLAP_ON_PAGE_CHANGE);

+	}

+

+	if (getLocalRectFromDocIndex(mCursorPos) == cursor_rect)

+	{

+		// cursor didn't change apparent position, so move to top or bottom of document, respectively

+		if (delta < 0)

+		{

+			startOfDoc();

+		}

+		else

+		{

+			endOfDoc();

+		}

+	}

+	else

+	{

+		setCursorAtLocalPos(cursor_rect.getCenterX(), cursor_rect.getCenterY(), true, false);

+	}

+}

+

+// Picks a new cursor position based on the screen size of text being drawn.

+void LLTextBase::setCursorAtLocalPos( S32 local_x, S32 local_y, bool round, bool keep_cursor_offset )

+{

+	setCursorPos(getDocIndexFromLocalCoord(local_x, local_y, round), keep_cursor_offset);

+}

+

+

+void LLTextBase::changeLine( S32 delta )

+{

+	S32 line = getLineNumFromDocIndex(mCursorPos);

+

+	S32 new_line = line;

+	if( (delta < 0) && (line > 0 ) )

+	{

+		new_line = line - 1;

+	}

+	else if( (delta > 0) && (line < (getLineCount() - 1)) )

+	{

+		new_line = line + 1;

+	}

+

+	LLRect visible_region = getVisibleDocumentRect();

+

+	S32 new_cursor_pos = getDocIndexFromLocalCoord(mDesiredXPixel, mLineInfoList[new_line].mRect.mBottom + mVisibleTextRect.mBottom - visible_region.mBottom, TRUE);

+	setCursorPos(new_cursor_pos, true);

+}

+

+bool LLTextBase::scrolledToStart()

+{

+	return mScroller->isAtTop();

+}

+

+bool LLTextBase::scrolledToEnd()

+{

+	return mScroller->isAtBottom();

+}

+

+

+bool LLTextBase::setCursor(S32 row, S32 column)

+{

+	if (0 <= row && row < (S32)mLineInfoList.size())

+	{

+		S32 doc_pos = mLineInfoList[row].mDocIndexStart;

+		column = llclamp(column, 0, mLineInfoList[row].mDocIndexEnd - mLineInfoList[row].mDocIndexStart - 1);

+		doc_pos += column;

+		updateCursorXPos();

+

+		return setCursorPos(doc_pos);

+	}

+	return false;

+}

+

+

+bool LLTextBase::setCursorPos(S32 cursor_pos, bool keep_cursor_offset)

+{

+	S32 new_cursor_pos = cursor_pos;

+	if (new_cursor_pos != mCursorPos)

+	{

+		new_cursor_pos = getEditableIndex(new_cursor_pos, new_cursor_pos >= mCursorPos);

+	}

+

+	mCursorPos = llclamp(new_cursor_pos, 0, (S32)getLength());

+	needsScroll();

+	if (!keep_cursor_offset)

+		updateCursorXPos();

+	// did we get requested position?

+	return new_cursor_pos == cursor_pos;

+}

+

+// constraint cursor to editable segments of document

+S32 LLTextBase::getEditableIndex(S32 index, bool increasing_direction)

+{

+	segment_set_t::iterator segment_iter;

+	S32 offset;

+	getSegmentAndOffset(index, &segment_iter, &offset);

+	if (segment_iter == mSegments.end())

+	{

+		return 0;

+	}

+

+	LLTextSegmentPtr segmentp = *segment_iter;

+

+	if (segmentp->canEdit()) 

+	{

+		return segmentp->getStart() + offset;			

+	}

+	else if (segmentp->getStart() < index && index < segmentp->getEnd())

+	{

+		// bias towards document end

+		if (increasing_direction)

+		{

+			return segmentp->getEnd();

+		}

+		// bias towards document start

+		else

+		{

+			return segmentp->getStart();

+		}

+	}

+	else

+	{

+		return index;

+	}

+}

+

+void LLTextBase::updateRects()

+{

+	if (mLineInfoList.empty()) 

+	{

+		mTextBoundingRect = LLRect(0, mVPad, mHPad, 0);

+	}

+	else

+	{

+		mTextBoundingRect = mLineInfoList.begin()->mRect;

+		for (line_list_t::const_iterator line_iter = ++mLineInfoList.begin();

+			line_iter != mLineInfoList.end();

+			++line_iter)

+		{

+			mTextBoundingRect.unionWith(line_iter->mRect);

+		}

+

+		mTextBoundingRect.mTop += mVPad;

+		// subtract a pixel off the bottom to deal with rounding errors in measuring font height

+		mTextBoundingRect.mBottom -= 1;

+

+		S32 delta_pos = -mTextBoundingRect.mBottom;

+		// move line segments to fit new document rect

+		for (line_list_t::iterator it = mLineInfoList.begin(); it != mLineInfoList.end(); ++it)

+		{

+			it->mRect.translate(0, delta_pos);

+		}

+		mTextBoundingRect.translate(0, delta_pos);

+	}

+

+	// update document container dimensions according to text contents

+	LLRect doc_rect = mTextBoundingRect;

+	// use old mVisibleTextRect constraint document to width of viewable region

+	doc_rect.mLeft = 0;

+

+	// allow horizontal scrolling?

+	// if so, use entire width of text contents

+	// otherwise, stop at width of mVisibleTextRect

+	doc_rect.mRight = mScroller 

+		? llmax(mVisibleTextRect.getWidth(), mTextBoundingRect.mRight)

+		: mVisibleTextRect.getWidth();

+

+	mDocumentView->setShape(doc_rect);

+

+	//update mVisibleTextRect *after* mDocumentView has been resized

+	// so that scrollbars are added if document needs to scroll

+	// since mVisibleTextRect does not include scrollbars

+	LLRect old_text_rect = mVisibleTextRect;

+	mVisibleTextRect = mScroller ? mScroller->getContentWindowRect() : getLocalRect();

+	//FIXME: replace border with image?

+	if (mBorderVisible)

+	{

+		mVisibleTextRect.stretch(-1);

+	}

+	if (mVisibleTextRect != old_text_rect)

+	{

+		needsReflow();

+	}

+

+	// update document container again, using new mVisibleTextRect (that has scrollbars enabled as needed)

+	doc_rect.mRight = mScroller 

+		? llmax(mVisibleTextRect.getWidth(), mTextBoundingRect.mRight)

+		: mVisibleTextRect.getWidth();

+	mDocumentView->setShape(doc_rect);

+}

+

+

+void LLTextBase::startSelection()

+{

+	if( !mIsSelecting )

+	{

+		mIsSelecting = TRUE;

+		mSelectionStart = mCursorPos;

+		mSelectionEnd = mCursorPos;

+	}

+}

+

+void LLTextBase::endSelection()

+{

+	if( mIsSelecting )

+	{

+		mIsSelecting = FALSE;

+		mSelectionEnd = mCursorPos;

+	}

+}

+

+// get portion of document that is visible in text editor

+LLRect LLTextBase::getVisibleDocumentRect() const

+{

+	if (mScroller)

+	{

+		return mScroller->getVisibleContentRect();

+	}

+	else

+	{

+		// entire document rect is visible when not scrolling

+		// but offset according to height of widget

+		LLRect doc_rect = mDocumentView->getLocalRect();

+		doc_rect.mLeft -= mDocumentView->getRect().mLeft;

+		// adjust for height of text above widget baseline

+		doc_rect.mBottom = doc_rect.getHeight() - mVisibleTextRect.getHeight();

+		return doc_rect;

+	}

+}

+

+//

+// LLTextSegment

+//

+

+LLTextSegment::~LLTextSegment()

+{}

+

+bool LLTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const { width = 0; height = 0; return false;}

+S32	LLTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const { return 0; }

+S32	LLTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const { return 0; }

+void LLTextSegment::updateLayout(const LLTextBase& editor) {}

+F32	LLTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect) { return draw_rect.mLeft; }

+bool LLTextSegment::canEdit() const { return false; }

+void LLTextSegment::unlinkFromDocument(LLTextBase*) {}

+void LLTextSegment::linkToDocument(LLTextBase*) {}

+const LLColor4& LLTextSegment::getColor() const { return LLColor4::white; }

+//void LLTextSegment::setColor(const LLColor4 &color) {}

+LLStyleConstSP LLTextSegment::getStyle() const {static LLStyleConstSP sp(new LLStyle()); return sp; }

+void LLTextSegment::setStyle(LLStyleConstSP style) {}

+void LLTextSegment::setToken( LLKeywordToken* token ) {}

+LLKeywordToken*	LLTextSegment::getToken() const { return NULL; }

+void LLTextSegment::setToolTip( const std::string &msg ) {}

+void LLTextSegment::dump() const {}

+BOOL LLTextSegment::handleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleMouseUp(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleMiddleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleMiddleMouseUp(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleRightMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleRightMouseUp(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleDoubleClick(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleHover(S32 x, S32 y, MASK mask) { return FALSE; }

+BOOL LLTextSegment::handleScrollWheel(S32 x, S32 y, S32 clicks) { return FALSE; }

+BOOL LLTextSegment::handleToolTip(S32 x, S32 y, MASK mask) { return FALSE; }

+std::string	LLTextSegment::getName() const { return ""; }

+void LLTextSegment::onMouseCaptureLost() {}

+void LLTextSegment::screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {}

+void LLTextSegment::localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {}

+BOOL LLTextSegment::hasMouseCapture() { return FALSE; }

+

+//

+// LLNormalTextSegment

+//

+

+LLNormalTextSegment::LLNormalTextSegment( LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor ) 

+:	LLTextSegment(start, end),

+	mStyle( style ),

+	mToken(NULL),

+	mEditor(editor)

+{

+	mFontHeight = llceil(mStyle->getFont()->getLineHeight());

+

+	LLUIImagePtr image = mStyle->getImage();

+	if (image.notNull())

+	{

+		mImageLoadedConnection = image->addLoadedCallback(boost::bind(&LLTextBase::needsReflow, &mEditor, start));

+	}

+}

+

+LLNormalTextSegment::LLNormalTextSegment( const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible) 

+:	LLTextSegment(start, end),

+	mToken(NULL),

+	mEditor(editor)

+{

+	mStyle = new LLStyle(LLStyle::Params().visible(is_visible).color(color));

+

+	mFontHeight = llceil(mStyle->getFont()->getLineHeight());

+}

+

+LLNormalTextSegment::~LLNormalTextSegment()

+{

+	mImageLoadedConnection.disconnect();

+}

+

+

+F32 LLNormalTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)

+{

+	if( end - start > 0 )

+	{

+		return drawClippedSegment( getStart() + start, getStart() + end, selection_start, selection_end, draw_rect);

+	}

+	return draw_rect.mLeft;

+}

+

+// Draws a single text segment, reversing the color for selection if needed.

+F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 selection_start, S32 selection_end, LLRect rect)

+{

+	F32 alpha = LLViewDrawContext::getCurrentContext().mAlpha;

+

+	const LLWString &text = mEditor.getWText();

+

+	F32 right_x = rect.mLeft;

+	if (!mStyle->isVisible())

+	{

+		return right_x;

+	}

+

+	const LLFontGL* font = mStyle->getFont();

+

+	LLColor4 color = (mEditor.getReadOnly() ? mStyle->getReadOnlyColor() : mStyle->getColor())  % alpha;

+

+  	if( selection_start > seg_start )

+	{

+		// Draw normally

+		S32 start = seg_start;

+		S32 end = llmin( selection_start, seg_end );

+		S32 length =  end - start;

+		font->render(text, start, 

+			     rect, 

+			     color, 

+			     LLFontGL::LEFT, mEditor.mVAlign, 

+			     LLFontGL::NORMAL, 

+			     mStyle->getShadowType(), 

+			     length,

+			     &right_x, 

+			     mEditor.getUseEllipses());

+	}

+	rect.mLeft = (S32)ceil(right_x);

+	

+	if( (selection_start < seg_end) && (selection_end > seg_start) )

+	{

+		// Draw reversed

+		S32 start = llmax( selection_start, seg_start );

+		S32 end = llmin( selection_end, seg_end );

+		S32 length = end - start;

+

+		font->render(text, start, 

+			     rect,

+			     LLColor4( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], 1.f ),

+			     LLFontGL::LEFT, mEditor.mVAlign, 

+			     LLFontGL::NORMAL, 

+			     LLFontGL::NO_SHADOW, 

+			     length,

+			     &right_x, 

+			     mEditor.getUseEllipses());

+	}

+	rect.mLeft = (S32)ceil(right_x);

+	if( selection_end < seg_end )

+	{

+		// Draw normally

+		S32 start = llmax( selection_end, seg_start );

+		S32 end = seg_end;

+		S32 length = end - start;

+		font->render(text, start, 

+			     rect, 

+			     color, 

+			     LLFontGL::LEFT, mEditor.mVAlign, 

+			     LLFontGL::NORMAL, 

+			     mStyle->getShadowType(), 

+			     length,

+			     &right_x, 

+			     mEditor.getUseEllipses());

+	}

+	return right_x;

+}

+

+BOOL LLNormalTextSegment::handleHover(S32 x, S32 y, MASK mask)

+{

+	if (getStyle() && getStyle()->isLink())

+	{

+		// Only process the click if it's actually in this segment, not to the right of the end-of-line.

+		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)

+		{

+			LLUI::getWindow()->setCursor(UI_CURSOR_HAND);

+			return TRUE;

+		}

+	}

+	return FALSE;

+}

+

+BOOL LLNormalTextSegment::handleRightMouseDown(S32 x, S32 y, MASK mask)

+{

+	if (getStyle() && getStyle()->isLink())

+	{

+		// Only process the click if it's actually in this segment, not to the right of the end-of-line.

+		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)

+		{

+			mEditor.createUrlContextMenu(x, y, getStyle()->getLinkHREF());

+			return TRUE;

+		}

+	}

+	return FALSE;

+}

+

+BOOL LLNormalTextSegment::handleMouseDown(S32 x, S32 y, MASK mask)

+{

+	if (getStyle() && getStyle()->isLink())

+	{

+		// Only process the click if it's actually in this segment, not to the right of the end-of-line.

+		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)

+		{

+			// eat mouse down event on hyperlinks, so we get the mouse up

+			return TRUE;

+		}

+	}

+

+	return FALSE;

+}

+

+BOOL LLNormalTextSegment::handleMouseUp(S32 x, S32 y, MASK mask)

+{

+	if (getStyle() && getStyle()->isLink())

+	{

+		// Only process the click if it's actually in this segment, not to the right of the end-of-line.

+		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)

+		{

+			LLUrlAction::clickAction(getStyle()->getLinkHREF());

+			return TRUE;

+		}

+	}

+

+	return FALSE;

+}

+

+BOOL LLNormalTextSegment::handleToolTip(S32 x, S32 y, MASK mask)

+{

+	std::string msg;

+	// do we have a tooltip for a loaded keyword (for script editor)?

+	if (mToken && !mToken->getToolTip().empty())

+	{

+		const LLWString& wmsg = mToken->getToolTip();

+		LLToolTipMgr::instance().show(wstring_to_utf8str(wmsg));

+		return TRUE;

+	}

+	// or do we have an explicitly set tooltip (e.g., for Urls)

+	if (!mTooltip.empty())

+	{

+		LLToolTipMgr::instance().show(mTooltip);

+		return TRUE;

+	}

+

+	return FALSE;

+}

+

+void LLNormalTextSegment::setToolTip(const std::string& tooltip)

+{

+	// we cannot replace a keyword tooltip that's loaded from a file

+	if (mToken)

+	{

+		llwarns << "LLTextSegment::setToolTip: cannot replace keyword tooltip." << llendl;

+		return;

+	}

+	mTooltip = tooltip;

+}

+

+bool LLNormalTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const

+{

+	height = 0;

+	width = 0;

+	if (num_chars > 0)

+	{

+		height = mFontHeight;

+		const LLWString &text = mEditor.getWText();

+		// if last character is a newline, then return true, forcing line break

+			width = mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars);

+		}

+	return false;

+}

+

+S32	LLNormalTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const

+{

+	const LLWString &text = mEditor.getWText();

+	return mStyle->getFont()->charFromPixelOffset(text.c_str(), mStart + start_offset,

+											   (F32)segment_local_x_coord,

+											   F32_MAX,

+											   num_chars,

+											   round);

+}

+

+S32	LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const

+{

+	const LLWString &text = mEditor.getWText();

+

+	LLUIImagePtr image = mStyle->getImage();

+	if( image.notNull())

+	{

+		num_pixels = llmax(0, num_pixels - image->getWidth());

+	}

+

+	S32 last_char = mEnd;

+

+	// set max characters to length of segment, or to first newline

+	max_chars = llmin(max_chars, last_char - (mStart + segment_offset));

+

+	// if no character yet displayed on this line, don't require word wrapping since

+	// we can just move to the next line, otherwise insist on it so we make forward progress

+	LLFontGL::EWordWrapStyle word_wrap_style = (line_offset == 0) 

+		? LLFontGL::WORD_BOUNDARY_IF_POSSIBLE 

+		: LLFontGL::ONLY_WORD_BOUNDARIES;

+	S32 num_chars = mStyle->getFont()->maxDrawableChars(text.c_str() + segment_offset + mStart, 

+												(F32)num_pixels,

+												max_chars, 

+												word_wrap_style);

+

+	if (num_chars == 0 

+		&& line_offset == 0 

+		&& max_chars > 0)

+	{

+		// If at the beginning of a line, and a single character won't fit, draw it anyway

+		num_chars = 1;

+	}

+

+	// include *either* the EOF or newline character in this run of text

+	// but not both

+	S32 last_char_in_run = mStart + segment_offset + num_chars;

+	// check length first to avoid indexing off end of string

+	if (last_char_in_run < mEnd 

+		&& (last_char_in_run >= mEditor.getLength() ))

+	{

+		num_chars++;

+	}

+	return num_chars;

+}

+

+void LLNormalTextSegment::dump() const

+{

+	llinfos << "Segment [" << 

+//			mColor.mV[VX] << ", " <<

+//			mColor.mV[VY] << ", " <<

+//			mColor.mV[VZ] << "]\t[" <<

+		mStart << ", " <<

+		getEnd() << "]" <<

+		llendl;

+}

+

+

+//

+// LLInlineViewSegment

+//

+

+LLInlineViewSegment::LLInlineViewSegment(const Params& p, S32 start, S32 end)

+:	LLTextSegment(start, end),

+	mView(p.view),

+	mForceNewLine(p.force_newline),

+	mLeftPad(p.left_pad),

+	mRightPad(p.right_pad),

+	mTopPad(p.top_pad),

+	mBottomPad(p.bottom_pad)

+{

+} 

+

+LLInlineViewSegment::~LLInlineViewSegment()

+{

+	mView->die();

+}

+

+bool LLInlineViewSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const

+{

+	if (first_char == 0 && num_chars == 0) 

+	{

+		// we didn't fit on a line, the widget will fall on the next line

+		// so dimensions here are 0

+		width = 0;

+		height = 0;

+	}

+	else

+	{

+		width = mLeftPad + mRightPad + mView->getRect().getWidth();

+		height = mBottomPad + mTopPad + mView->getRect().getHeight();

+	}

+

+	return false;

+}

+

+S32	LLInlineViewSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const

+{

+	// if putting a widget anywhere but at the beginning of a line

+	// and the widget doesn't fit or mForceNewLine is true

+	// then return 0 chars for that line, and all characters for the next

+	if (line_offset != 0 

+		&& (mForceNewLine || num_pixels < mView->getRect().getWidth())) 

+	{

+		return 0;

+	}

+	else

+	{

+		return mEnd - mStart;

+	}

+}

+

+void LLInlineViewSegment::updateLayout(const LLTextBase& editor)

+{

+	LLRect start_rect = editor.getDocRectFromDocIndex(mStart);

+	mView->setOrigin(start_rect.mLeft + mLeftPad, start_rect.mBottom + mBottomPad);

+}

+

+F32	LLInlineViewSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)

+{

+	// return padded width of widget

+	// widget is actually drawn during mDocumentView's draw()

+	return (F32)(draw_rect.mLeft + mView->getRect().getWidth() + mLeftPad + mRightPad);

+}

+

+void LLInlineViewSegment::unlinkFromDocument(LLTextBase* editor)

+{

+	editor->removeDocumentChild(mView);

+}

+

+void LLInlineViewSegment::linkToDocument(LLTextBase* editor)

+{

+	editor->addDocumentChild(mView);

+}

+

+LLLineBreakTextSegment::LLLineBreakTextSegment(S32 pos):LLTextSegment(pos,pos+1)

+{

+	LLStyleSP s( new LLStyle(LLStyle::Params().visible(true)));

+

+	mFontHeight = llceil(s->getFont()->getLineHeight());

+}

+LLLineBreakTextSegment::LLLineBreakTextSegment(LLStyleConstSP style,S32 pos):LLTextSegment(pos,pos+1)

+{

+	mFontHeight = llceil(style->getFont()->getLineHeight());

+}

+LLLineBreakTextSegment::~LLLineBreakTextSegment()

+{

+}

+bool LLLineBreakTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const

+{

+	width = 0;

+	height = mFontHeight;

+

+	return true;

+}

+S32	LLLineBreakTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const

+{

+	return 1;

+}

+F32	LLLineBreakTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)

+{

+	return  draw_rect.mLeft;

+}

+

+LLImageTextSegment::LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor)

+	:LLTextSegment(pos,pos+1)

+	,mStyle( style )

+	,mEditor(editor)

+{

+}

+

+LLImageTextSegment::~LLImageTextSegment()

+{

+}

+

+static const S32 IMAGE_HPAD = 3;

+

+bool LLImageTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const

+{

+	width = 0;

+	height = llceil(mStyle->getFont()->getLineHeight());;

+

+	LLUIImagePtr image = mStyle->getImage();

+	if( num_chars>0 && image.notNull())

+	{

+		width += image->getWidth() + IMAGE_HPAD;

+		height = llmax(height, image->getHeight() + IMAGE_HPAD );

+	}

+	return false;

+}

+

+S32	 LLImageTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const

+{

+	LLUIImagePtr image = mStyle->getImage();

+	S32 image_width = image->getWidth();

+	if(line_offset == 0 || num_pixels>image_width + IMAGE_HPAD)

+	{

+		return 1;

+	}

+	return 0;

+}

+

+F32	LLImageTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)

+{

+	if ( (start >= 0) && (end <= mEnd - mStart))

+	{

+		LLColor4 color = LLColor4::white % mEditor.getDrawContext().mAlpha;

+		LLUIImagePtr image = mStyle->getImage();

+		S32 style_image_height = image->getHeight();

+		S32 style_image_width = image->getWidth();

+		// Text is drawn from the top of the draw_rect downward

+		

+		S32 text_center = draw_rect.mTop - (draw_rect.getHeight() / 2);

+		// Align image to center of draw rect

+		S32 image_bottom = text_center - (style_image_height / 2);

+		image->draw(draw_rect.mLeft, image_bottom, 

+			style_image_width, style_image_height, color);

+		

+		const S32 IMAGE_HPAD = 3;

+		return draw_rect.mLeft + style_image_width + IMAGE_HPAD;

+	}

+	return 0.0;

+}

+

diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 25c538951a..3608808c27 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -47,8 +47,170 @@
 #include <boost/signals2.hpp>
 
 class LLContextMenu;
-class LLTextSegment;
-class LLNormalTextSegment;
+class LLUrlMatch;
+
+///
+/// A text segment is used to specify a subsection of a text string
+/// that should be formatted differently, such as a hyperlink. It
+/// includes a start/end offset from the start of the string, a
+/// style to render with, an optional tooltip, etc.
+///
+class LLTextSegment : public LLRefCount, public LLMouseHandler
+{
+public:
+	LLTextSegment(S32 start, S32 end) : mStart(start), mEnd(end){};
+	virtual ~LLTextSegment();
+
+	virtual bool				getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
+	virtual S32					getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
+	virtual S32					getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	virtual void				updateLayout(const class LLTextBase& editor);
+	virtual F32					draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+	virtual bool				canEdit() const;
+	virtual void				unlinkFromDocument(class LLTextBase* editor);
+	virtual void				linkToDocument(class LLTextBase* editor);
+
+	virtual const LLColor4&		getColor() const;
+	//virtual void 				setColor(const LLColor4 &color);
+	virtual LLStyleConstSP		getStyle() const;
+	virtual void 				setStyle(LLStyleConstSP style);
+	virtual void				setToken( LLKeywordToken* token );
+	virtual LLKeywordToken*		getToken() const;
+	virtual void				setToolTip(const std::string& tooltip);
+	virtual void				dump() const;
+
+	// LLMouseHandler interface
+	/*virtual*/ BOOL			handleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleMiddleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleMiddleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleRightMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleRightMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleDoubleClick(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL			handleScrollWheel(S32 x, S32 y, S32 clicks);
+	/*virtual*/ BOOL			handleToolTip(S32 x, S32 y, MASK mask);
+	/*virtual*/ std::string		getName() const;
+	/*virtual*/ void			onMouseCaptureLost();
+	/*virtual*/ void			screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const;
+	/*virtual*/ void			localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const;
+	/*virtual*/ BOOL			hasMouseCapture();
+
+	S32							getStart() const 					{ return mStart; }
+	void						setStart(S32 start)					{ mStart = start; }
+	S32							getEnd() const						{ return mEnd; }
+	void						setEnd( S32 end )					{ mEnd = end; }
+
+protected:
+	S32				mStart;
+	S32				mEnd;
+};
+
+class LLNormalTextSegment : public LLTextSegment
+{
+public:
+	LLNormalTextSegment( LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor );
+	LLNormalTextSegment( const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible = TRUE);
+	~LLNormalTextSegment();
+
+	/*virtual*/ bool				getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
+	/*virtual*/ S32					getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
+	/*virtual*/ S32					getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	/*virtual*/ F32					draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+	/*virtual*/ bool				canEdit() const { return true; }
+	/*virtual*/ const LLColor4&		getColor() const					{ return mStyle->getColor(); }
+	/*virtual*/ LLStyleConstSP		getStyle() const					{ return mStyle; }
+	/*virtual*/ void 				setStyle(LLStyleConstSP style)	{ mStyle = style; }
+	/*virtual*/ void				setToken( LLKeywordToken* token )	{ mToken = token; }
+	/*virtual*/ LLKeywordToken*		getToken() const					{ return mToken; }
+	/*virtual*/ BOOL				getToolTip( std::string& msg ) const;
+	/*virtual*/ void				setToolTip(const std::string& tooltip);
+	/*virtual*/ void				dump() const;
+
+	/*virtual*/ BOOL				handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL				handleRightMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL				handleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL				handleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL				handleToolTip(S32 x, S32 y, MASK mask);
+
+protected:
+	F32					drawClippedSegment(S32 seg_start, S32 seg_end, S32 selection_start, S32 selection_end, LLRect rect);
+
+protected:
+	class LLTextBase&	mEditor;
+	LLStyleConstSP		mStyle;
+	S32					mFontHeight;
+	LLKeywordToken* 	mToken;
+	std::string     	mTooltip;
+	boost::signals2::connection mImageLoadedConnection;
+};
+
+class LLIndexSegment : public LLTextSegment
+{
+public:
+	LLIndexSegment(S32 pos) : LLTextSegment(pos, pos) {}
+};
+
+class LLInlineViewSegment : public LLTextSegment
+{
+public:
+	struct Params : public LLInitParam::Block<Params>
+	{
+		Mandatory<LLView*>		view;
+		Optional<bool>			force_newline;
+		Optional<S32>			left_pad,
+								right_pad,
+								bottom_pad,
+								top_pad;
+	};
+
+	LLInlineViewSegment(const Params& p, S32 start, S32 end);
+	~LLInlineViewSegment();
+	/*virtual*/ bool		getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
+	/*virtual*/ S32			getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	/*virtual*/ void		updateLayout(const class LLTextBase& editor);
+	/*virtual*/ F32			draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+	/*virtual*/ bool		canEdit() const { return false; }
+	/*virtual*/ void		unlinkFromDocument(class LLTextBase* editor);
+	/*virtual*/ void		linkToDocument(class LLTextBase* editor);
+
+private:
+	S32 mLeftPad;
+	S32 mRightPad;
+	S32 mTopPad;
+	S32 mBottomPad;
+	LLView* mView;
+	bool	mForceNewLine;
+};
+
+class LLLineBreakTextSegment : public LLTextSegment
+{
+public:
+
+	LLLineBreakTextSegment(LLStyleConstSP style,S32 pos);
+	LLLineBreakTextSegment(S32 pos);
+	~LLLineBreakTextSegment();
+	bool		getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
+	S32			getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	F32			draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+
+private:
+	S32			mFontHeight;
+};
+
+class LLImageTextSegment : public LLTextSegment
+{
+public:
+	LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor);
+	~LLImageTextSegment();
+	bool		getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
+	S32			getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
+	F32			draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
+
+private:
+	class LLTextBase&	mEditor;
+	LLStyleConstSP	mStyle;
+};
 
 typedef LLPointer<LLTextSegment> LLTextSegmentPtr;
 
@@ -196,6 +358,10 @@ public:
 
 	const LLFontGL*			getDefaultFont() const					{ return mDefaultFont; }
 
+	virtual void			appendLineBreakSegment(const LLStyle::Params& style_params);
+	virtual void			appendImageSegment(const LLStyle::Params& style_params);
+	virtual void			appendWidget(const LLInlineViewSegment::Params& params, const std::string& text, bool allow_undo);
+
 public:
 	// Fired when a URL link is clicked
 	commit_signal_t mURLClickSignal;
@@ -323,9 +489,6 @@ protected:
 	// 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);
-
-	void							appendLineBreakSegment(const LLStyle::Params& style_params);
-	void							appendImageSegment(S32 highlight_part, const LLStyle::Params& style_params);
 	
 	void							appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params = LLStyle::Params());
 	void							appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params);
@@ -361,6 +524,7 @@ protected:
 	S32							mHPad;				// padding on left of text
 	S32							mVPad;				// padding above text
 	LLFontGL::HAlign			mHAlign;
+	LLFontGL::VAlign			mVAlign;
 	F32							mLineSpacingMult;	// multiple of line height used as space for a single line of text (e.g. 1.5 to get 50% padding)
 	S32							mLineSpacingPixels;	// padding between lines
 	const LLFontGL*				mDefaultFont;		// font that is used when none specified
@@ -389,167 +553,4 @@ protected:
 
 };
 
-///
-/// A text segment is used to specify a subsection of a text string
-/// that should be formatted differently, such as a hyperlink. It
-/// includes a start/end offset from the start of the string, a
-/// style to render with, an optional tooltip, etc.
-///
-class LLTextSegment : public LLRefCount, public LLMouseHandler
-{
-public:
-	LLTextSegment(S32 start, S32 end) : mStart(start), mEnd(end){};
-	virtual ~LLTextSegment();
-
-	virtual bool				getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
-	virtual S32					getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
-	virtual S32					getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
-	virtual void				updateLayout(const class LLTextBase& editor);
-	virtual F32					draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
-	virtual bool				canEdit() const;
-	virtual void				unlinkFromDocument(class LLTextBase* editor);
-	virtual void				linkToDocument(class LLTextBase* editor);
-
-	virtual const LLColor4&		getColor() const;
-	//virtual void 				setColor(const LLColor4 &color);
-	virtual LLStyleConstSP		getStyle() const;
-	virtual void 				setStyle(LLStyleConstSP style);
-	virtual void				setToken( LLKeywordToken* token );
-	virtual LLKeywordToken*		getToken() const;
-	virtual void				setToolTip(const std::string& tooltip);
-	virtual void				dump() const;
-
-	// LLMouseHandler interface
-	/*virtual*/ BOOL			handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleMiddleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleMiddleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleRightMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleRightMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleDoubleClick(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL			handleScrollWheel(S32 x, S32 y, S32 clicks);
-	/*virtual*/ BOOL			handleToolTip(S32 x, S32 y, MASK mask);
-	/*virtual*/ std::string		getName() const;
-	/*virtual*/ void			onMouseCaptureLost();
-	/*virtual*/ void			screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const;
-	/*virtual*/ void			localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const;
-	/*virtual*/ BOOL			hasMouseCapture();
-
-	S32							getStart() const 					{ return mStart; }
-	void						setStart(S32 start)					{ mStart = start; }
-	S32							getEnd() const						{ return mEnd; }
-	void						setEnd( S32 end )					{ mEnd = end; }
-
-protected:
-	S32				mStart;
-	S32				mEnd;
-};
-
-class LLNormalTextSegment : public LLTextSegment
-{
-public:
-	LLNormalTextSegment( LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor );
-	LLNormalTextSegment( const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible = TRUE);
-	~LLNormalTextSegment();
-
-	/*virtual*/ bool				getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
-	/*virtual*/ S32					getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
-	/*virtual*/ S32					getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
-	/*virtual*/ F32					draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
-	/*virtual*/ bool				canEdit() const { return true; }
-	/*virtual*/ const LLColor4&		getColor() const					{ return mStyle->getColor(); }
-	/*virtual*/ LLStyleConstSP		getStyle() const					{ return mStyle; }
-	/*virtual*/ void 				setStyle(LLStyleConstSP style)	{ mStyle = style; }
-	/*virtual*/ void				setToken( LLKeywordToken* token )	{ mToken = token; }
-	/*virtual*/ LLKeywordToken*		getToken() const					{ return mToken; }
-	/*virtual*/ BOOL				getToolTip( std::string& msg ) const;
-	/*virtual*/ void				setToolTip(const std::string& tooltip);
-	/*virtual*/ void				dump() const;
-
-	/*virtual*/ BOOL				handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL				handleRightMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL				handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL				handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL				handleToolTip(S32 x, S32 y, MASK mask);
-
-protected:
-	F32					drawClippedSegment(S32 seg_start, S32 seg_end, S32 selection_start, S32 selection_end, LLRect rect);
-
-protected:
-	class LLTextBase&	mEditor;
-	LLStyleConstSP		mStyle;
-	S32					mFontHeight;
-	LLKeywordToken* 	mToken;
-	std::string     	mTooltip;
-	boost::signals2::connection mImageLoadedConnection;
-};
-
-class LLIndexSegment : public LLTextSegment
-{
-public:
-	LLIndexSegment(S32 pos) : LLTextSegment(pos, pos) {}
-};
-
-class LLInlineViewSegment : public LLTextSegment
-{
-public:
-	struct Params : public LLInitParam::Block<Params>
-	{
-		Mandatory<LLView*>		view;
-		Optional<bool>			force_newline;
-		Optional<S32>			left_pad,
-								right_pad,
-								bottom_pad,
-								top_pad;
-	};
-
-	LLInlineViewSegment(const Params& p, S32 start, S32 end);
-	~LLInlineViewSegment();
-	/*virtual*/ bool		getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
-	/*virtual*/ S32			getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
-	/*virtual*/ void		updateLayout(const class LLTextBase& editor);
-	/*virtual*/ F32			draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
-	/*virtual*/ bool		canEdit() const { return false; }
-	/*virtual*/ void		unlinkFromDocument(class LLTextBase* editor);
-	/*virtual*/ void		linkToDocument(class LLTextBase* editor);
-
-private:
-	S32 mLeftPad;
-	S32 mRightPad;
-	S32 mTopPad;
-	S32 mBottomPad;
-	LLView* mView;
-	bool	mForceNewLine;
-};
-
-class LLLineBreakTextSegment : public LLTextSegment
-{
-public:
-
-	LLLineBreakTextSegment(LLStyleConstSP style,S32 pos);
-	LLLineBreakTextSegment(S32 pos);
-	~LLLineBreakTextSegment();
-	bool		getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
-	S32			getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
-	F32			draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
-
-private:
-	S32			mFontHeight;
-};
-
-class LLImageTextSegment : public LLTextSegment
-{
-public:
-	LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor);
-	~LLImageTextSegment();
-	bool		getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
-	S32			getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
-	F32			draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect);
-
-private:
-	class LLTextBase&	mEditor;
-	LLStyleConstSP	mStyle;
-};
-
 #endif
diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp
index c5f3929fb1..56664071b7 100644
--- a/indra/llui/lltextutil.cpp
+++ b/indra/llui/lltextutil.cpp
@@ -34,7 +34,9 @@
 
 #include "lluicolor.h"
 #include "lltextbox.h"
+#include "llurlmatch.h"
 
+boost::function<bool(LLUrlMatch*,LLTextBase*)>	LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0;
 
 void LLTextUtil::textboxSetHighlightedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& hl)
 {
@@ -76,4 +78,36 @@ const std::string& LLTextUtil::formatPhoneNumber(const std::string& phone_str)
 	return formatted_phone_str;
 }
 
+bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base)
+{
+	if (match == 0 || text_base == 0)
+		return false;
+
+	if(match->getID() != LLUUID::null && TextHelpers::iconCallbackCreationFunction)
+	{
+		bool segment_created = TextHelpers::iconCallbackCreationFunction(match,text_base);
+		if(segment_created)
+			return true;
+	}
+
+	// output an optional icon before the Url
+	if (!match->getIcon().empty() )
+	{
+		LLUIImagePtr image = LLUI::getUIImage(match->getIcon());
+		if (image)
+		{
+			LLStyle::Params icon;
+			icon.image = image;
+			// Text will be replaced during rendering with the icon,
+			// but string cannot be empty or the segment won't be
+			// added (or drawn).
+			text_base->appendImageSegment(icon);
+
+			return true;
+		}
+	}
+	
+	return false;
+}
+
 // EOF
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
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index bf12384a28..7f9dca08d2 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -97,7 +97,6 @@ static LLDefaultChildRegistry::Register<LLFlyoutButton> register_flyout_button("
 static LLDefaultChildRegistry::Register<LLSearchEditor> register_search_editor("search_editor");
 
 // register other widgets which otherwise may not be linked in
-static LLDefaultChildRegistry::Register<LLMenuButton> register_menu_button("menu_button");
 static LLDefaultChildRegistry::Register<LLLoadingIndicator> register_loading_indicator("loading_indicator");
 
 
@@ -1752,6 +1751,33 @@ std::string LLUI::getLanguage()
 	return language;
 }
 
+struct SubDir : public LLInitParam::Block<SubDir>
+{
+	Mandatory<std::string> value;
+
+	SubDir()
+	:	value("value")
+	{}
+};
+
+struct Directory : public LLInitParam::Block<Directory>
+{
+	Multiple<SubDir, AtLeast<1> > subdirs;
+
+	Directory()
+	:	subdirs("subdir")
+	{}
+};
+
+struct Paths : public LLInitParam::Block<Paths>
+{
+	Multiple<Directory, AtLeast<1> > directories;
+
+	Paths()
+	:	directories("directory")
+	{}
+};
+
 //static
 void LLUI::setupPaths()
 {
@@ -1759,21 +1785,36 @@ void LLUI::setupPaths()
 
 	LLXMLNodePtr root;
 	BOOL success  = LLXMLNode::parseFile(filename, root, NULL);
+	Paths paths;
+	LLXUIParser::instance().readXUI(root, paths, filename);
+
 	sXUIPaths.clear();
 	
-	if (success)
+	if (success && paths.validateBlock())
 	{
 		LLStringUtil::format_map_t path_args;
 		path_args["[LANGUAGE]"] = LLUI::getLanguage();
 		
-		for (LLXMLNodePtr path = root->getFirstChild(); path.notNull(); path = path->getNextSibling())
+		for (LLInitParam::ParamIterator<Directory>::const_iterator it = paths.directories().begin(), 
+				end_it = paths.directories().end();
+			it != end_it;
+			++it)
 		{
-			std::string path_val_ui(path->getValue());
+			std::string path_val_ui;
+			for (LLInitParam::ParamIterator<SubDir>::const_iterator subdir_it = it->subdirs().begin(),
+					subdir_end_it = it->subdirs().end();
+				subdir_it != subdir_end_it;)
+			{
+				path_val_ui += subdir_it->value();
+				if (++subdir_it != subdir_end_it)
+					path_val_ui += gDirUtilp->getDirDelimiter();
+			}
 			LLStringUtil::format(path_val_ui, path_args);
 			if (std::find(sXUIPaths.begin(), sXUIPaths.end(), path_val_ui) == sXUIPaths.end())
 			{
 				sXUIPaths.push_back(path_val_ui);
 			}
+
 		}
 	}
 	else // parsing failed
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index b9a4f61e15..1f9d2c9049 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -47,14 +47,10 @@
 const BOOL TAKE_FOCUS_YES = TRUE;
 const BOOL TAKE_FOCUS_NO  = FALSE;
 
-// NOTE: the LLFocusableElement class declaration has been moved from here to llfocusmgr.h.
-
 class LLUICtrl
 	: public LLView, public boost::signals2::trackable
 {
 public:
-
-
 	typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> commit_callback_t;
 	typedef boost::signals2::signal<void (LLUICtrl* ctrl, const LLSD& param)> commit_signal_t;
 	// *TODO: add xml support for this type of signal in the future
@@ -111,8 +107,8 @@ public:
 										commit_callback;
 		Optional<EnableCallbackParam>	validate_callback;
 		
-		Optional<CommitCallbackParam>	mouseenter_callback;
-		Optional<CommitCallbackParam>	mouseleave_callback;
+		Optional<CommitCallbackParam>	mouseenter_callback,
+										mouseleave_callback;
 		
 		Optional<std::string>			control_name;
 		Optional<EnableControls>		enabled_controls;
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 930dadc377..a46d961709 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -101,7 +101,9 @@ void LLUICtrlFactory::loadWidgetTemplate(const std::string& widget_tag, LLInitPa
 
 	if (LLUICtrlFactory::getLayeredXMLNode(filename, root_node))
 	{
+		LLUICtrlFactory::instance().pushFileName(filename);
 		LLXUIParser::instance().readXUI(root_node, block, filename);
+		LLUICtrlFactory::instance().popFileName();
 	}
 }
 
@@ -211,7 +213,7 @@ bool LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filen
 	bool res = true;
 	
 	lldebugs << "Building floater " << filename << llendl;
-	mFileNames.push_back(gDirUtilp->findSkinnedFilename(LLUI::getSkinPath(), filename));
+	pushFileName(filename);
 	{
 		if (!floaterp->getFactoryMap().empty())
 		{
@@ -222,7 +224,7 @@ bool LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filen
 		floaterp->getCommitCallbackRegistrar().pushScope();
 		floaterp->getEnableCallbackRegistrar().pushScope();
 		
-		res = floaterp->initFloaterXML(root, floaterp->getParent(), output_node);
+		res = floaterp->initFloaterXML(root, floaterp->getParent(), filename, output_node);
 
 		floaterp->setXMLFilename(filename);
 		
@@ -234,7 +236,7 @@ bool LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filen
 			mFactoryStack.pop_front();
 		}
 	}
-	mFileNames.pop_back();
+	popFileName();
 	
 	return res;
 }
@@ -283,7 +285,7 @@ BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename, L
 
 	lldebugs << "Building panel " << filename << llendl;
 
-	mFileNames.push_back(gDirUtilp->findSkinnedFilename(LLUI::getSkinPath(), filename));
+	pushFileName(filename);
 	{
 		if (!panelp->getFactoryMap().empty())
 		{
@@ -306,7 +308,7 @@ BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename, L
 			mFactoryStack.pop_front();
 		}
 	}
-	mFileNames.pop_back();
+	popFileName();
 	return didPost;
 }
 
@@ -364,6 +366,23 @@ LLPanel* LLUICtrlFactory::createFactoryPanel(const std::string& name)
 	return create<LLPanel>(panel_p);
 }
 
+std::string LLUICtrlFactory::getCurFileName() 
+{ 
+	return mFileNames.empty() ? "" : gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + mFileNames.back(); 
+}
+
+
+void LLUICtrlFactory::pushFileName(const std::string& name) 
+{ 
+	mFileNames.push_back(gDirUtilp->findSkinnedFilename(LLUI::getSkinPath(), name)); 
+}
+
+void LLUICtrlFactory::popFileName() 
+{ 
+	mFileNames.pop_back(); 
+}
+
+
 //-----------------------------------------------------------------------------
 
 //static
@@ -433,14 +452,22 @@ void LLUICtrlFactory::registerWidget(const std::type_info* widget_type, const st
 {
 	// associate parameter block type with template .xml file
 	std::string* existing_tag = LLWidgetNameRegistry::instance().getValue(param_block_type);
-	if (existing_tag != NULL && *existing_tag != tag)
+	if (existing_tag != NULL)
 	{
-		std::cerr << "Duplicate entry for T::Params, try creating empty param block in derived classes that inherit T::Params" << std::endl;
-		// forcing crash here
-		char* foo = 0;
-		*foo = 1;
+		if(*existing_tag != tag)
+		{
+			std::cerr << "Duplicate entry for T::Params, try creating empty param block in derived classes that inherit T::Params" << std::endl;
+			// forcing crash here
+			char* foo = 0;
+			*foo = 1;
+		}
+		else
+		{
+			// widget already registered
+			return;
+		}
 	}
-	LLWidgetNameRegistry ::instance().defaultRegistrar().add(param_block_type, tag);
+	LLWidgetNameRegistry::instance().defaultRegistrar().add(param_block_type, tag);
 	// associate widget type with factory function
 	LLDefaultWidgetRegistry::instance().defaultRegistrar().add(widget_type, creator_func);
 	//FIXME: comment this in when working on schema generation
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index b1fa6add67..c99acee48e 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -170,7 +170,9 @@ public:
 	// Returns 0 on success
 	S32 saveToXML(LLView* viewp, const std::string& filename);
 
-	std::string getCurFileName() { return mFileNames.empty() ? "" : mFileNames.back(); }
+	std::string getCurFileName();
+	void pushFileName(const std::string& name);
+	void popFileName();
 
 	static BOOL getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color);
 
@@ -229,7 +231,7 @@ public:
 		T* widget = NULL;
 
 		std::string skinned_filename = findSkinnedFilename(filename);
-		getInstance()->mFileNames.push_back(skinned_filename);
+		instance().pushFileName(filename);
 		{
 			LLXMLNodePtr root_node;
 
@@ -263,7 +265,7 @@ public:
 			}
 		}
 fail:
-		getInstance()->mFileNames.pop_back();
+		instance().popFileName();
 		return widget;
 	}
 
@@ -371,8 +373,9 @@ LLChildRegistry<DERIVED>::Register<T>::Register(const char* tag, LLWidgetCreator
 	LLUICtrlFactory::instance().registerWidget(&typeid(T), &typeid(typename T::Params), &LLUICtrlFactory::createDefaultWidget<T>, tag);
 	
 	// since registry_t depends on T, do this in line here
-	typedef typename T::child_registry_t registry_t;
-	LLChildRegistryRegistry::instance().defaultRegistrar().add(&typeid(T), registry_t::instance());
+	// TODO: uncomment this for schema generation
+	//typedef typename T::child_registry_t registry_t;
+	//LLChildRegistryRegistry::instance().defaultRegistrar().add(&typeid(T), registry_t::instance());
 }
 
 
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)
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 04423a81a3..f60ef0d968 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -172,6 +172,7 @@ public:
 	/*virtual*/ std::string getIcon(const std::string &url);
 	/*virtual*/ std::string getTooltip(const std::string &string) const;
 	/*virtual*/ LLStyle::Params getStyle() const;
+	/*virtual*/ LLUUID	getID(const std::string &string) const;
 protected:
 	/*virtual*/ void callObservers(const std::string &id, const std::string &label, const std::string& icon);
 private:
@@ -246,6 +247,7 @@ public:
 	LLUrlEntryGroup();
 	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
 	/*virtual*/ LLStyle::Params getStyle() const;
+	/*virtual*/ LLUUID	getID(const std::string &string) const;
 private:
 	void onGroupNameReceived(const LLUUID& id, const std::string& name, bool is_group);
 };
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index bd56da9121..394ec957d5 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -111,6 +111,8 @@ LLView::Params::Params()
 	user_resize("user_resize"),
 	auto_resize("auto_resize"),
 	needs_translate("translate"),
+	min_width("min_width"),
+	max_width("max_width"),
 	xmlns("xmlns"),
 	xmlns_xsi("xmlns:xsi"),
 	xsi_schemaLocation("xsi:schemaLocation"),
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 3779fedf34..aba6c310f1 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -148,6 +148,8 @@ public:
 		Ignored						user_resize,
 									auto_resize,
 									needs_translate,
+									min_width,
+									max_width,
 									xmlns,
 									xmlns_xsi,
 									xsi_schemaLocation,
@@ -308,7 +310,8 @@ public:
 
 	void			pushVisible(BOOL visible)	{ mLastVisible = mVisible; setVisible(visible); }
 	void			popVisible()				{ setVisible(mLastVisible); }
-	
+	BOOL			getLastVisible()	const	{ return mLastVisible; }
+
 	LLHandle<LLView>	getHandle()				{ mHandle.bind(this); return mHandle; }
 
 	U32			getFollows() const				{ return mReshapeFlags; }
@@ -634,7 +637,7 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) co
 		// did we find *something* with that name?
 		if (child)
 		{
-			llwarns << "Found child named " << name << " but of wrong type " << typeid(*child).name() << ", expecting " << typeid(T*).name() << llendl;
+			llwarns << "Found child named \"" << name << "\" but of wrong type " << typeid(*child).name() << ", expecting " << typeid(T*).name() << llendl;
 		}
 		result = getDefaultWidget<T>(name);
 		if (!result)