merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3

DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)

1 files changed, 26 insertions, 4 deletions

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 8aa7540446..4a9fec3191 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -278,24 +278,46 @@ void LLUICtrl::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	mMouseLeaveSignal(this, getValue());
 }
+
 //virtual 
-BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask){
+BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask)
+{
 	BOOL handled  = LLView::handleMouseDown(x,y,mask);
 	mMouseDownSignal(this,x,y,mask);
 	return handled;
 }
+
 //virtual
-BOOL LLUICtrl::handleMouseUp(S32 x, S32 y, MASK mask){
+BOOL LLUICtrl::handleMouseUp(S32 x, S32 y, MASK mask)
+{
 	BOOL handled  = LLView::handleMouseUp(x,y,mask);
 	mMouseUpSignal(this,x,y,mask);
 	return handled;
 }
+
+//virtual
+BOOL LLUICtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	BOOL handled  = LLView::handleRightMouseDown(x,y,mask);
+	mRightMouseDownSignal(this,x,y,mask);
+	return handled;
+}
+
 //virtual
-BOOL LLUICtrl::handleRightMouseUp(S32 x, S32 y, MASK mask){
+BOOL LLUICtrl::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
 	BOOL handled  = LLView::handleRightMouseUp(x,y,mask);
-	mRightClickSignal(this,x,y,mask);
+	mRightMouseUpSignal(this,x,y,mask);
 	return handled;
 }
+
+// can't tab to children of a non-tab-stop widget
+BOOL LLUICtrl::canFocusChildren() const
+{
+	return hasTabStop();
+}
+
+
 void LLUICtrl::onCommit()
 {
 	mCommitSignal(this, getValue());