QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme

svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.

5 files changed, 15 insertions, 8 deletions

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 1b4d4e7d54..8ae0137a5e 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -68,6 +68,7 @@ set(llui_SOURCE_FILES
     lluictrl.cpp
     lluictrlfactory.cpp
     lluistring.cpp
+    lluitrans.cpp
     llundo.cpp
     llviewborder.cpp
     llview.cpp
@@ -124,6 +125,7 @@ set(llui_HEADER_FILES
     lluifwd.h
     llui.h
     lluistring.h
+    lluitrans.h
     lluixmltags.h
     llundo.h
     llviewborder.h
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index c4e928ce55..3d92280828 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -780,7 +780,7 @@ void LLFloater::snappedTo(const LLView* snap_view)
 
 void LLFloater::userSetShape(const LLRect& new_rect)
 {
-	const LLRect& old_rect = getRect();
+	const LLRect old_rect = getRect();
 	LLView::userSetShape(new_rect);
 
 	// if not minimized, adjust all snapped dependents to new shape
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index ad980d67fc..64649b664c 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -59,6 +59,8 @@
 #include "llresmgr.h"
 #include "llui.h"
 
+#include "lluitrans.h"
+
 #include "llstl.h"
 
 #include "v2math.h"
@@ -267,24 +269,24 @@ void LLMenuItemGL::appendAcceleratorString( std::string& st ) const
 	{
 		if ( mAcceleratorMask & MASK_MAC_CONTROL )
 		{
-			st.append( "Ctrl-" );
+			st.append( LLUITrans::getString("accel-mac-control") );
 		}
 		else
 		{
-			st.append( "Cmd-" );		// Symbol would be "\xE2\x8C\x98"
+			st.append( LLUITrans::getString("accel-mac-command") );		// Symbol would be "\xE2\x8C\x98"
 		}
 	}
 	if( mAcceleratorMask & MASK_ALT )
-		st.append( "Opt-" );		// Symbol would be "\xE2\x8C\xA5"
+		st.append( LLUITrans::getString("accel-mac-option") );		// Symbol would be "\xE2\x8C\xA5"
 	if( mAcceleratorMask & MASK_SHIFT )
-		st.append( "Shift-" );		// Symbol would be "\xE2\x8C\xA7"
+		st.append( LLUITrans::getString("accel-mac-shift") );		// Symbol would be "\xE2\x8C\xA7"
 #else
 	if( mAcceleratorMask & MASK_CONTROL )
-		st.append( "Ctrl-" );
+		st.append( LLUITrans::getString("accel-win-control") );
 	if( mAcceleratorMask & MASK_ALT )
-		st.append( "Alt-" );
+		st.append( LLUITrans::getString("accel-win-alt") );
 	if( mAcceleratorMask & MASK_SHIFT )
-		st.append( "Shift-" );
+		st.append( LLUITrans::getString("accel-win-shift") );
 #endif
 
 	std::string keystr = LLKeyboard::stringFromKey( mAcceleratorKey );
diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h
index 424cda1207..dfd0eb3ac1 100644
--- a/indra/llui/llspinctrl.h
+++ b/indra/llui/llspinctrl.h
@@ -82,6 +82,7 @@ public:
 	virtual void	setFocus( BOOL b );
 	virtual void	clear();
 	virtual BOOL	isDirty() const { return( mValue != mInitialValue ); }
+	virtual void    resetDirty() { mInitialValue = mValue; }
 
 	virtual void	setPrecision(S32 precision);
 	virtual void	setMinValue(F32 min)			{ mMinValue = min; }
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3ad4270929..a626a7a1bc 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1322,6 +1322,8 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
 			
 			setCursorAtLocalPos( x, y, TRUE );
 			endSelection();
+
+			updateScrollFromCursor();
 		}
 		
 		if( !hasSelection() )