diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index f3afadca159aa85bb979c78740b1f6cac1b7d36b..d7c0cf4f7b2984c3570cea8a34166651d3b054d0 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -124,6 +124,8 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 	mScrollHPos( 0 ),
 	mTextPadLeft(p.text_pad_left),
 	mTextPadRight(p.text_pad_right),
+	mMinHPixels(0),		// computed in updateTextPadding() below
+	mMaxHPixels(0),		// computed in updateTextPadding() below
 	mCommitOnFocusLost( p.commit_on_focus_lost ),
 	mRevertOnEsc( TRUE ),
 	mKeystrokeCallback( p.keystroke_callback() ),
@@ -1554,7 +1556,8 @@ void LLLineEditor::draw()
 
 	// draw text
 
-	S32 cursor_bottom = background.mBottom + 1;
+	// With viewer-2 art files, input region is 2 pixels up
+	S32 cursor_bottom = background.mBottom + 2;
 	S32 cursor_top = background.mTop - 1;
 
 	LLColor4 text_color;
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e53b50c216d004310fb89aab8cdcf102c99260a7..d328a3856f1f05594af492db6c27e0c067e53f11 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8036,7 +8036,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>3</integer>
     </map>
     <key>UIMaxComboWidth</key>
     <map>