Fixed chat channel control value not updating when Return key pressed

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f3fba08..f98be93 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -15,11 +15,16 @@
                 modified:   linden/indra/newview/llworldmapview.cpp
                 
         
-        * Temporarily disable chat channel control in chat history until it works right.
+        * Temporarily disable chat channel control in chat history until it's fixed.
         
                 modified:   linden/indra/newview/llchatbar.cpp
                 modified:   linden/indra/newview/llfloaterchat.cpp
                 modified:   linden/indra/newview/llprefschat.cpp
+                
+                
+        * Fixed chat channel control value not updating when Return key pressed.
+        
+                modified:   linden/indra/llui/llspinctrl.cpp
 
 
 2009-09-24 McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 51daefb..4f1ba26 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -468,6 +468,11 @@ BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask)
                         LLSpinCtrl::onDownBtn(this);
                         return TRUE;
                 }
+                if(key == KEY_RETURN)
+                {
+                        forceEditorCommit();
+                        return TRUE;
+                }
         }
         return FALSE;
 }