Merge from default branch

--HG--
branch : product-engine

5 files changed, 40 insertions, 18 deletions

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 07c0f3ce84..89c4656297 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -512,6 +512,8 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 			// 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);
 		}
 
 		// ask LLUICtrlFactory for filename, since xml_filename might be empty
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 0ff0472b97..9706878a57 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2375,7 +2375,9 @@ bool LLNormalTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& widt
 
 	height = mFontHeight;
 	width = mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars);
-	return num_chars >= 1 && text[mStart + num_chars - 1] == '\n';
+	// if last character is a newline, then return true, forcing line break
+	llwchar last_char = text[mStart + first_char + num_chars - 1];
+	return num_chars >= 1 && last_char == '\n';
 }
 
 S32	LLNormalTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 984a534da6..bb85177811 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -172,7 +172,6 @@ LLToolTip::Params::Params()
 
 LLToolTip::LLToolTip(const LLToolTip::Params& p)
 :	LLPanel(p),
-	mMaxWidth(p.max_width),
 	mHasClickCallback(p.click_callback.isProvided()),
 	mPadding(p.padding),
 	mTextBox(NULL),
@@ -181,11 +180,9 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
 	mHomePageButton(NULL)
 {
 	LLTextBox::Params params;
-	params.initial_value = "tip_text";
 	params.name = params.initial_value().asString();
 	// bake textbox padding into initial rect
 	params.rect = LLRect (mPadding, mPadding + 1, mPadding + 1, mPadding);
-	params.follows.flags = FOLLOWS_ALL;
 	params.h_pad = 0;
 	params.v_pad = 0;
 	params.mouse_opaque = false;
@@ -210,7 +207,6 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
 		TOOLTIP_ICON_SIZE = (imagep ? imagep->getWidth() : 16);
 		icon_rect.setOriginAndSize(mPadding, mPadding, TOOLTIP_ICON_SIZE, TOOLTIP_ICON_SIZE);
 		icon_params.rect = icon_rect;
-		//icon_params.follows.flags = FOLLOWS_LEFT | FOLLOWS_BOTTOM;
 		icon_params.image_unselected(imagep);
 		icon_params.image_selected(imagep);
 
@@ -281,15 +277,30 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
 	}
 }
 
-void LLToolTip::setValue(const LLSD& value)
+void LLToolTip::initFromParams(const LLToolTip::Params& p)
 {
+	LLPanel::initFromParams(p);
+
+	// do this *after* we've had our size set in LLPanel::initFromParams();
 	const S32 REALLY_LARGE_HEIGHT = 10000;
-	reshape(mMaxWidth, REALLY_LARGE_HEIGHT);
+	mTextBox->reshape(p.max_width, REALLY_LARGE_HEIGHT);
 
-	mTextBox->setValue(value);
+	if (p.styled_message.isProvided())
+	{
+		for (LLInitParam::ParamIterator<LLToolTip::StyledText>::const_iterator text_it = p.styled_message().begin();
+			text_it != p.styled_message().end();
+			++text_it)
+		{
+			mTextBox->appendText(text_it->text(), false, text_it->style);
+		}
+	}
+	else
+	{
+		mTextBox->setText(p.message());
+	}
 
 	LLRect text_contents_rect = mTextBox->getContentsRect();
-	S32 text_width = llmin(mMaxWidth, text_contents_rect.getWidth());
+	S32 text_width = llmin(p.max_width(), text_contents_rect.getWidth());
 	S32 text_height = text_contents_rect.getHeight();
 	mTextBox->reshape(text_width, text_height);
 
@@ -300,7 +311,7 @@ void LLToolTip::setValue(const LLSD& value)
 	tooltip_rect.mBottom = 0;
 	tooltip_rect.mLeft = 0;
 
-	setRect(tooltip_rect);
+	setShape(tooltip_rect);
 }
 
 void LLToolTip::setVisible(BOOL visible)
@@ -411,9 +422,8 @@ void LLToolTipMgr::createToolTip(const LLToolTip::Params& params)
 	}
 	tooltip_params.rect = LLRect (0, 1, 1, 0);
 
-
 	mToolTip = LLUICtrlFactory::create<LLToolTip> (tooltip_params);
-	mToolTip->setValue(params.message());
+
 	gToolTipView->addChild(mToolTip);
 
 	if (params.pos.isProvided())
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index 774ca507c1..8c8fdf0a4c 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -37,6 +37,7 @@
 #include "llsingleton.h"
 #include "llinitparam.h"
 #include "llpanel.h"
+#include "llstyle.h"
 
 //
 // Classes
@@ -65,11 +66,19 @@ public:
 class LLToolTip : public LLPanel
 {
 public:
+
+	struct StyledText : public LLInitParam::Block<StyledText>
+	{
+		Mandatory<std::string>		text;
+		Optional<LLStyle::Params>	style;
+	};
+
 	struct Params : public LLInitParam::Block<Params, LLPanel::Params> 
 	{
 		typedef boost::function<void(void)> click_callback_t;
 
-		Mandatory<std::string>		message;
+		Optional<std::string>		message;
+		Multiple<StyledText>		styled_message;
 
 		Optional<LLCoordGL>			pos;
 		Optional<F32>				delay_time,
@@ -85,8 +94,8 @@ public:
 		Optional<click_callback_t>	click_callback,
 									click_playmedia_callback,
 									click_homepage_callback;
-		Optional<S32>				max_width;
-		Optional<S32>				padding;
+		Optional<S32>				max_width,
+									padding;
 		Optional<bool>				wrap;
 
 		Params();
@@ -94,7 +103,6 @@ public:
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
 	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
-	/*virtual*/ void setValue(const LLSD& value);
 	/*virtual*/ void setVisible(BOOL visible);
 
 	bool isFading();
@@ -102,6 +110,7 @@ public:
 	bool hasClickCallback();
 
 	LLToolTip(const Params& p);
+	void initFromParams(const LLToolTip::Params& params);
 
 private:
 	class LLTextBox*	mTextBox;
@@ -111,7 +120,6 @@ private:
 
 	LLFrameTimer	mFadeTimer;
 	LLFrameTimer	mVisibleTimer;
-	S32				mMaxWidth;
 	bool			mHasClickCallback;
 	S32				mPadding;	// pixels
 };
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 08fc8fb784..dd807a3f7e 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -38,7 +38,7 @@
 #include "llpanel.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl");
+static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl");
 
 LLUICtrl::Params::Params()
 :	tab_stop("tab_stop", true),