Second Life viewer sources 1.15.1.3

1 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index ec156ba..a2cd9af 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -711,11 +711,11 @@ S32 LLLineEditor::prevWordPos(S32 cursorPos) const
 S32 LLLineEditor::nextWordPos(S32 cursorPos) const
 {
         const LLWString& wtext = mText.getWString();
-        while( (cursorPos < getLength()) && isPartOfWord( wtext[cursorPos+1] ) )
+        while( (cursorPos < getLength()) && isPartOfWord( wtext[cursorPos] ) )
         {
                 cursorPos++;
         } 
-        while( (cursorPos < getLength()) && (wtext[cursorPos+1] == ' ') )
+        while( (cursorPos < getLength()) && (wtext[cursorPos] == ' ') )
         {
                 cursorPos++;
         }
@@ -1035,7 +1035,8 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
                 break;
 
         case KEY_LEFT:
-                if (!mIgnoreArrowKeys)
+                if (!mIgnoreArrowKeys
+                        && mask != MASK_ALT)
                 {
                         if( hasSelection() )
                         {
@@ -1060,7 +1061,8 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
                 break;
 
         case KEY_RIGHT:
-                if (!mIgnoreArrowKeys)
+                if (!mIgnoreArrowKeys
+                        && mask != MASK_ALT)
                 {
                         if (hasSelection())
                         {