Second Life viewer sources 1.19.0.3

1 files changed, 11 insertions, 7 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index f522abb..b458d7f 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2099,15 +2099,17 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                                 }
 
                                                 // Handle preedit string.
-                                                if (preedit_string.length() > 0)
+                                                if (preedit_string.length() == 0)
                                                 {
-                                                        if (preedit_segment_lengths.size() == 0)
-                                                        {
-                                                                preedit_segment_lengths.push_back(preedit_string.length());
-                                                                preedit_standouts.push_back(FALSE);
-                                                        }
-                                                        mPreeditor->updatePreedit(preedit_string, preedit_segment_lengths, preedit_standouts, caret_position);
+                                                        preedit_segment_lengths.clear();
+                                                        preedit_standouts.clear();
+                                                }
+                                                else if (preedit_segment_lengths.size() == 0)
+                                                {
+                                                        preedit_segment_lengths.push_back(preedit_string.length());
+                                                        preedit_standouts.push_back(FALSE);
                                                 }
+                                                mPreeditor->updatePreedit(preedit_string, preedit_segment_lengths, preedit_standouts, caret_position);
 
                                                 result = noErr;
                                         }
@@ -3354,6 +3356,8 @@ void LLWindowMacOSX::interruptLanguageTextInput()
         {
                 FixTSMDocument(mTSMDocument);
         }
+        // Don't we need to call resetPreedit here?
+        // Well, if Apple's TSM document is correct, we don't.
 }
 
 #endif // LL_DARWIN