1 files changed, 8 insertions, 4 deletions

diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 59aa572..41d2e08 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -115,6 +116,7 @@ LLChatBar::LLChatBar()
 
 LLChatBar::~LLChatBar()
 {
+        gGestureManager.removeObserver(mObserver);
         delete mObserver;
         mObserver = NULL;
         // LLView destructor cleans up children
@@ -522,7 +524,8 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
                 {
                         if (self->mInputEditor)
                         {
-                                self->mInputEditor->setText(utf8_out_str);
+                                std::string rest_of_match = utf8_out_str.substr(utf8_trigger.size());
+                                self->mInputEditor->setText(utf8_trigger + rest_of_match); // keep original capitalization for user-entered part
                                 S32 outlength = self->mInputEditor->getLength(); // in characters
                         
                                 // Select to end of line, starting from the character
@@ -684,10 +687,11 @@ class LLChatHandler : public LLCommandHandler
 {
 public:
         // not allowed from outside the app
-        LLChatHandler() : LLCommandHandler("chat", false) { }
+        LLChatHandler() : LLCommandHandler("chat", true) { }
 
     // Your code here
-        bool handle(const LLSD& tokens, const LLSD& queryMap)
+        bool handle(const LLSD& tokens, const LLSD& query_map,
+                                LLWebBrowserCtrl* web)
         {
                 if (tokens.size() < 2) return false;
                 S32 channel = tokens[0].asInteger();