Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 1e973c0..2f531a2 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -469,6 +469,11 @@ BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask)
                         LLSpinCtrl::onDownBtn(this);
                         return TRUE;
                 }
+                if(key == KEY_RETURN)
+                {
+                        forceEditorCommit();
+                        return TRUE;
+                }
         }
         return FALSE;
 }