35 files changed, 281 insertions, 60 deletions

diff --git a/linden/indra/llwindow/lldxhardware.cpp b/linden/indra/llwindow/lldxhardware.cpp
index 82d80ec..1a39e68 100644
--- a/linden/indra/llwindow/lldxhardware.cpp
+++ b/linden/indra/llwindow/lldxhardware.cpp
@@ -2,6 +2,8 @@
  * @file lldxhardware.cpp
  * @brief LLDXHardware implementation
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifdef LL_WINDOWS
@@ -32,7 +35,6 @@
 
 #include "linden_common.h"
 
-#include <assert.h>
 #include <dxdiag.h>
 
 #include <boost/tokenizer.hpp>
diff --git a/linden/indra/llwindow/lldxhardware.h b/linden/indra/llwindow/lldxhardware.h
index 0574880..1d5d69d 100644
--- a/linden/indra/llwindow/lldxhardware.h
+++ b/linden/indra/llwindow/lldxhardware.h
@@ -2,6 +2,8 @@
  * @file lldxhardware.h
  * @brief LLDXHardware definition
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLDXHARDWARE_H
diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index 2310684..35f20d3 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -2,6 +2,8 @@
  * @file llgl.cpp
  * @brief LLGL implementation
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 // This file sets some global GL parameters, and implements some 
diff --git a/linden/indra/llwindow/llgl.h b/linden/indra/llwindow/llgl.h
index c83ccb8..2a23a23 100644
--- a/linden/indra/llwindow/llgl.h
+++ b/linden/indra/llwindow/llgl.h
@@ -2,6 +2,8 @@
  * @file llgl.h
  * @brief LLGL definition
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLGL_H
diff --git a/linden/indra/llwindow/llglheaders.h b/linden/indra/llwindow/llglheaders.h
index 1d815ee..b98c832 100644
--- a/linden/indra/llwindow/llglheaders.h
+++ b/linden/indra/llwindow/llglheaders.h
@@ -2,6 +2,8 @@
  * @file llglheaders.h
  * @brief LLGL definitions
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLGLHEADERS_H
diff --git a/linden/indra/llwindow/llglstates.h b/linden/indra/llwindow/llglstates.h
index 887d099..cbe1300 100644
--- a/linden/indra/llwindow/llglstates.h
+++ b/linden/indra/llwindow/llglstates.h
@@ -2,6 +2,8 @@
  * @file llglstates.h
  * @brief LLGL states definitions
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 //THIS HEADER SHOULD ONLY BE INCLUDED FROM llgl.h
diff --git a/linden/indra/llwindow/llglstubs.h b/linden/indra/llwindow/llglstubs.h
index fbbcd1f..e070aa2 100644
--- a/linden/indra/llwindow/llglstubs.h
+++ b/linden/indra/llwindow/llglstubs.h
@@ -2,6 +2,8 @@
  * @file llglstubs.h
  * @brief LLGL stubs header file
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 
diff --git a/linden/indra/llwindow/llgltypes.h b/linden/indra/llwindow/llgltypes.h
index d130a42..42050cf 100644
--- a/linden/indra/llwindow/llgltypes.h
+++ b/linden/indra/llwindow/llgltypes.h
@@ -2,6 +2,8 @@
  * @file llgltypes.h
  * @brief LLGL definition
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LLGLTYPES_H
diff --git a/linden/indra/llwindow/llkeyboard.cpp b/linden/indra/llwindow/llkeyboard.cpp
index 213fe85..23f3dc7 100644
--- a/linden/indra/llwindow/llkeyboard.cpp
+++ b/linden/indra/llwindow/llkeyboard.cpp
@@ -2,6 +2,8 @@
  * @file llkeyboard.cpp
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llwindow/llkeyboard.h b/linden/indra/llwindow/llkeyboard.h
index 61ae2ea..55af6fe 100644
--- a/linden/indra/llwindow/llkeyboard.h
+++ b/linden/indra/llwindow/llkeyboard.h
@@ -2,6 +2,8 @@
  * @file llkeyboard.h
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLKEYBOARD_H
diff --git a/linden/indra/llwindow/llkeyboardmacosx.cpp b/linden/indra/llwindow/llkeyboardmacosx.cpp
index 6d06d53..74b64b4 100644
--- a/linden/indra/llwindow/llkeyboardmacosx.cpp
+++ b/linden/indra/llwindow/llkeyboardmacosx.cpp
@@ -2,6 +2,8 @@
  * @file llkeyboardmacosx.cpp
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_DARWIN
diff --git a/linden/indra/llwindow/llkeyboardmacosx.h b/linden/indra/llwindow/llkeyboardmacosx.h
index 899b011..d897faa 100644
--- a/linden/indra/llwindow/llkeyboardmacosx.h
+++ b/linden/indra/llwindow/llkeyboardmacosx.h
@@ -2,6 +2,8 @@
  * @file llkeyboardmacosx.h
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLKEYBOARDMACOSX_H
diff --git a/linden/indra/llwindow/llkeyboardsdl.cpp b/linden/indra/llwindow/llkeyboardsdl.cpp
index 027f6a4..d832506 100644
--- a/linden/indra/llwindow/llkeyboardsdl.cpp
+++ b/linden/indra/llwindow/llkeyboardsdl.cpp
@@ -2,6 +2,8 @@
  * @file llkeyboardsdl.cpp
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_SDL
diff --git a/linden/indra/llwindow/llkeyboardsdl.h b/linden/indra/llwindow/llkeyboardsdl.h
index 7546496..d3a08ed 100644
--- a/linden/indra/llwindow/llkeyboardsdl.h
+++ b/linden/indra/llwindow/llkeyboardsdl.h
@@ -2,6 +2,8 @@
  * @file llkeyboardsdl.h
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLKEYBOARDSDL_H
diff --git a/linden/indra/llwindow/llkeyboardwin32.cpp b/linden/indra/llwindow/llkeyboardwin32.cpp
index f9db941..a5e7f3b 100644
--- a/linden/indra/llwindow/llkeyboardwin32.cpp
+++ b/linden/indra/llwindow/llkeyboardwin32.cpp
@@ -2,6 +2,8 @@
  * @file llkeyboardwin32.cpp
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_WINDOWS
diff --git a/linden/indra/llwindow/llkeyboardwin32.h b/linden/indra/llwindow/llkeyboardwin32.h
index 33233c9..10eb4c1 100644
--- a/linden/indra/llwindow/llkeyboardwin32.h
+++ b/linden/indra/llwindow/llkeyboardwin32.h
@@ -2,6 +2,8 @@
  * @file llkeyboardwin32.h
  * @brief Handler for assignable key bindings
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLKEYBOARDWIN32_H
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index 3091920..057c75e 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -2,6 +2,8 @@
  * @file llmousehandler.h
  * @brief LLMouseHandler class definition
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_MOUSEHANDLER_H
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index faa5e61..e845afe 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -2,6 +2,8 @@
  * @file llwindow.cpp
  * @brief Basic graphical window class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 1016bce..4db2c81 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -2,6 +2,8 @@
  * @file llwindow.h
  * @brief Basic graphical window class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOW_H
@@ -220,7 +223,7 @@ public:
         
         // control platform's Language Text Input mechanisms.
         virtual void allowLanguageTextInput( BOOL b ) {};
-        virtual void setLanguageTextInput( LLCoordWindow pos ) {};
+        virtual void setLanguageTextInput( const LLCoordGL & pos ) {};
 
 protected:
         LLWindow(BOOL fullscreen, U32 flags);
diff --git a/linden/indra/llwindow/llwindowheadless.cpp b/linden/indra/llwindow/llwindowheadless.cpp
index 62306f1..1b55791 100644
--- a/linden/indra/llwindow/llwindowheadless.cpp
+++ b/linden/indra/llwindow/llwindowheadless.cpp
@@ -2,6 +2,8 @@
  * @file llwindowheadless.cpp
  * @brief Headless implementation of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llwindow/llwindowheadless.h b/linden/indra/llwindow/llwindowheadless.h
index c474a5a..4962cf7 100644
--- a/linden/indra/llwindow/llwindowheadless.h
+++ b/linden/indra/llwindow/llwindowheadless.h
@@ -2,6 +2,8 @@
  * @file llwindowheadless.h
  * @brief Headless definition of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOWHEADLESS_H
diff --git a/linden/indra/llwindow/llwindowlinux.cpp b/linden/indra/llwindow/llwindowlinux.cpp
index 79f4d48..80da7e2 100644
--- a/linden/indra/llwindow/llwindowlinux.cpp
+++ b/linden/indra/llwindow/llwindowlinux.cpp
@@ -2,6 +2,8 @@
  * @file llwindowlinux.cpp
  * @brief Platform-dependent implementation of llwindow
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_LINUX
diff --git a/linden/indra/llwindow/llwindowlinux.h b/linden/indra/llwindow/llwindowlinux.h
index 0465ef4..e7bcf4e 100644
--- a/linden/indra/llwindow/llwindowlinux.h
+++ b/linden/indra/llwindow/llwindowlinux.h
@@ -2,6 +2,8 @@
  * @file llwindowlinux.h
  * @brief Linux implementation of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOWWIN32_H
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.h b/linden/indra/llwindow/llwindowmacosx-objc.h
index d17fa61..a5c9e7a 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.h
+++ b/linden/indra/llwindow/llwindowmacosx-objc.h
@@ -3,6 +3,8 @@
  * @brief Prototypes for functions shared between llwindowmacosx.cpp
  * and llwindowmacosx-objc.mm.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index 241f821..b68ea8e 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.mm
+++ b/linden/indra/llwindow/llwindowmacosx-objc.mm
@@ -3,6 +3,8 @@
  * @brief Definition of functions shared between llwindowmacosx.cpp
  * and llwindowmacosx-objc.mm.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <AppKit/AppKit.h>
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 021d7a4..2724cb5 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2,6 +2,8 @@
  * @file llwindowmacosx.cpp
  * @brief Platform-dependent implementation of llwindow
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_DARWIN
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index 01b9303..ee3019b 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -2,6 +2,8 @@
  * @file llwindowmacosx.h
  * @brief Mac implementation of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOWMACOSX_H
diff --git a/linden/indra/llwindow/llwindowmesaheadless.cpp b/linden/indra/llwindow/llwindowmesaheadless.cpp
index f10d7cd..f32ca01 100644
--- a/linden/indra/llwindow/llwindowmesaheadless.cpp
+++ b/linden/indra/llwindow/llwindowmesaheadless.cpp
@@ -2,6 +2,8 @@
  * @file llwindowmesaheadless.cpp
  * @brief Platform-dependent implementation of llwindow
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_MESA_HEADLESS
diff --git a/linden/indra/llwindow/llwindowmesaheadless.h b/linden/indra/llwindow/llwindowmesaheadless.h
index f0ad50e..fe91a2d 100644
--- a/linden/indra/llwindow/llwindowmesaheadless.h
+++ b/linden/indra/llwindow/llwindowmesaheadless.h
@@ -2,6 +2,8 @@
  * @file llwindowmesaheadless.h
  * @brief Windows implementation of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOWMESAHEADLESS_H
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 9756e09..ad39c84 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -2,6 +2,8 @@
  * @file llwindowsdl.cpp
  * @brief SDL implementation of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_SDL
@@ -2035,10 +2038,6 @@ void LLWindowSDL::gatherInput()
                 if (SDLCheckGrabbyKeys(event.key.keysym.sym, FALSE) == 0)
                         SDLReallyCaptureInput(FALSE); // part of the fix for SL-13243
 
-                // This is a testing hack to pop up a dialog when 4 is pressed
-                //if (event.key.keysym.sym == SDLK_4)
-                //OSMessageBox("a whole bunch of text goes right here, whee!  test test test.", "this is the title!", OSMB_YESNO);
-
                 gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod);
                 break;
 
@@ -2119,9 +2118,9 @@ void LLWindowSDL::gatherInput()
                 else if (event.button.button == SDL_BUTTON_RIGHT)  // right ... yes, it's 3, not 2, in SDL...
                                     mCallbacks->handleRightMouseUp(this, openGlCoord, mask);
                 else if (event.button.button == SDL_BUTTON_MIDDLE)  // middle
-                                {
-                                        mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
-                                }
+                {
+                        mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
+                }
                 // don't handle mousewheel here...
 
                 break;
@@ -2175,18 +2174,18 @@ void LLWindowSDL::gatherInput()
                 }
                 if (event.active.state & SDL_APPACTIVE)
                 {
-                                        // Change in iconification/minimization state.
-                                        if ((!event.active.gain) != mIsMinimized)
-                                        {
-                                                mCallbacks->handleActivate(this, !!event.active.gain);
-                                                llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
-                        
-                                                mIsMinimized = (!event.active.gain);
-                                        }
-                                        else
-                                        {
-                                                llinfos << "Ignored bogus redundant SDL deiconification state switch to " << BOOL(event.active.gain) << llendl;
-                                        }
+                        // Change in iconification/minimization state.
+                        if ((!event.active.gain) != mIsMinimized)
+                        {
+                                mCallbacks->handleActivate(this, !!event.active.gain);
+                                llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
+        
+                                mIsMinimized = (!event.active.gain);
+                        }
+                        else
+                        {
+                                llinfos << "Ignored bogus redundant SDL deiconification state switch to " << BOOL(event.active.gain) << llendl;
+                        }
                 }
                 break;
 
@@ -2713,6 +2712,7 @@ void spawn_web_browser(const char* escaped_url)
         cmd += "launch_url.sh";
         char* const argv[] = {(char*)cmd.c_str(), (char*)escaped_url, NULL};
 
+        fflush(NULL);
         pid_t pid = fork();
         if (pid == 0)
         { // child
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 2e75239..aa331ed 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -2,6 +2,8 @@
  * @file llwindowsdl.h
  * @brief SDL implementation of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOWSDL_H
diff --git a/linden/indra/llwindow/llwindowsolaris.cpp b/linden/indra/llwindow/llwindowsolaris.cpp
index 7e3c3e6..425e545 100644
--- a/linden/indra/llwindow/llwindowsolaris.cpp
+++ b/linden/indra/llwindow/llwindowsolaris.cpp
@@ -2,6 +2,8 @@
  * @file fmodwrapper.cpp
  * @brief dummy source file for building a shared library to wrap libfmod.a
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #if LL_SOLARIS
diff --git a/linden/indra/llwindow/llwindowsolaris.h b/linden/indra/llwindow/llwindowsolaris.h
index 57aa9b9..7b43197 100644
--- a/linden/indra/llwindow/llwindowsolaris.h
+++ b/linden/indra/llwindow/llwindowsolaris.h
@@ -2,6 +2,8 @@
  * @file fmodwrapper.cpp
  * @brief dummy source file for building a shared library to wrap libfmod.a
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOWSOLARIS_H
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 3a41d01..bb99d4c 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2,6 +2,8 @@
  * @file llwindowwin32.cpp
  * @brief Platform-dependent implementation of llwindow
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
@@ -85,11 +88,10 @@ void show_window_creation_error(const char* title)
 //static
 BOOL LLWindowWin32::sIsClassRegistered = FALSE;
 
-BOOL    LLWindowWin32::sLanguageTextInputAllowed = TRUE; /* XXX */
-BOOL    LLWindowWin32::sWinIMEOpened = FALSE;
-HKL             LLWindowWin32::sWinInputLocale;
-DWORD   LLWindowWin32::sWinIMEConversionMode;
-DWORD   LLWindowWin32::sWinIMESentenceMode;
+BOOL    LLWindowWin32::sLanguageTextInputAllowed = TRUE;
+HKL             LLWindowWin32::sWinInputLocale = 0;
+DWORD   LLWindowWin32::sWinIMEConversionMode = IME_CMODE_NATIVE;
+DWORD   LLWindowWin32::sWinIMESentenceMode = IME_SMODE_AUTOMATIC;
 
 // The following class LLWinImm delegates Windows IMM APIs.
 // We need this because some language versions of Windows,
@@ -107,13 +109,15 @@ public:
 
 public:
         // Wrappers for IMM API.
-        static BOOL             isIME(HKL hkl)                                                                                                                  { return sTheInstance.mImmIsIME(hkl); }
-        static HIMC             getContext(HWND hwnd)                                                                                                   { return sTheInstance.mImmGetContext(hwnd); }
-        static BOOL             releaseContext(HWND hwnd, HIMC himc)                                                                    { return sTheInstance.mImmReleaseContext(hwnd, himc); }
-        static BOOL             getOpenStatus(HIMC himc)                                                                                                { return sTheInstance.mImmGetOpenStatus(himc); }
-        static BOOL             setOpenStatus(HIMC himc, BOOL status)                                                                   { return sTheInstance.mImmSetOpenStatus(himc, status); }
-        static BOOL             getConversionStatus(HIMC himc, LPDWORD conversion, LPDWORD sentence)    { return sTheInstance.mImmGetConversionStatus(himc, conversion, sentence); }
-        static BOOL             setConversionStatus(HIMC himc, DWORD conversion, DWORD sentence)                { return sTheInstance.mImmSetConversionStatus(himc, conversion, sentence); }
+        static BOOL             isIME(HKL hkl);                                                                                                                 
+        static HIMC             getContext(HWND hwnd);                                                                                                  
+        static BOOL             releaseContext(HWND hwnd, HIMC himc);
+        static BOOL             getOpenStatus(HIMC himc);                                                                                               
+        static BOOL             setOpenStatus(HIMC himc, BOOL status);                                                                  
+        static BOOL             getConversionStatus(HIMC himc, LPDWORD conversion, LPDWORD sentence);   
+        static BOOL             setConversionStatus(HIMC himc, DWORD conversion, DWORD sentence);               
+        static BOOL             getCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form);                                        
+        static BOOL             setCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form);                                        
 
 private:
         LLWinImm();
@@ -128,6 +132,8 @@ private:
         BOOL            (WINAPI *mImmSetOpenStatus)(HIMC, BOOL);
         BOOL            (WINAPI *mImmGetConversionStatus)(HIMC, LPDWORD, LPDWORD);
         BOOL            (WINAPI *mImmSetConversionStatus)(HIMC, DWORD, DWORD);
+        BOOL            (WINAPI *mImmGetCompostitionWindow)(HIMC, LPCOMPOSITIONFORM);
+        BOOL            (WINAPI *mImmSetCompostitionWindow)(HIMC, LPCOMPOSITIONFORM);
 
 private:
         HMODULE         mHImmDll;
@@ -136,8 +142,13 @@ private:
 
 LLWinImm LLWinImm::sTheInstance;
 
-LLWinImm::LLWinImm()
+LLWinImm::LLWinImm() : mHImmDll(NULL)
 {
+        // Check system metrics 
+        if ( !GetSystemMetrics( SM_DBCSENABLED ) )
+                return;
+        
+
         mHImmDll = LoadLibraryA("Imm32");
         if (mHImmDll != NULL)
         {
@@ -148,13 +159,18 @@ LLWinImm::LLWinImm()
                 mImmSetOpenStatus       = (BOOL (WINAPI *)(HIMC, BOOL))             GetProcAddress(mHImmDll, "ImmSetOpenStatus");
                 mImmGetConversionStatus = (BOOL (WINAPI *)(HIMC, LPDWORD, LPDWORD)) GetProcAddress(mHImmDll, "ImmGetConversionStatus");
                 mImmSetConversionStatus = (BOOL (WINAPI *)(HIMC, DWORD, DWORD))     GetProcAddress(mHImmDll, "ImmSetConversionStatus");
+                mImmGetCompostitionWindow = (BOOL (WINAPI *)(HIMC, LPCOMPOSITIONFORM))   GetProcAddress(mHImmDll, "ImmGetCompositionWindow");
+                mImmSetCompostitionWindow = (BOOL (WINAPI *)(HIMC, LPCOMPOSITIONFORM))   GetProcAddress(mHImmDll, "ImmSetCompositionWindow");
+
                 if (mImmIsIME == NULL ||
                         mImmGetContext == NULL ||
                         mImmReleaseContext == NULL ||
                         mImmGetOpenStatus == NULL ||
                         mImmSetOpenStatus == NULL ||
                         mImmGetConversionStatus == NULL ||
-                        mImmSetConversionStatus == NULL)
+                        mImmSetConversionStatus == NULL ||
+                        mImmGetCompostitionWindow == NULL ||
+                        mImmSetCompostitionWindow == NULL)
                 {
                         // If any of the above API entires are not found, we can't use IMM API.  
                         // So, turn off the IMM support.  We should log some warning message in 
@@ -165,10 +181,96 @@ LLWinImm::LLWinImm()
                         // is one of disadvantages to use static constraction to DLL loading. 
                         FreeLibrary(mHImmDll);
                         mHImmDll = NULL;
+
+                        // If we unload the library, make sure all the function pointers are cleared
+                        mImmIsIME = NULL;
+                        mImmGetContext = NULL;
+                        mImmReleaseContext = NULL;
+                        mImmGetOpenStatus = NULL;
+                        mImmSetOpenStatus = NULL;
+                        mImmGetConversionStatus = NULL;
+                        mImmSetConversionStatus = NULL;
+                        mImmGetCompostitionWindow = NULL;
+                        mImmSetCompostitionWindow = NULL;
                 }
         }
 }
 
+
+// static 
+BOOL    LLWinImm::isIME(HKL hkl)                                                                                                                        
+{ 
+        if ( sTheInstance.mImmIsIME )
+                return sTheInstance.mImmIsIME(hkl); 
+        return FALSE;
+}
+
+// static 
+HIMC            LLWinImm::getContext(HWND hwnd)
+{
+        if ( sTheInstance.mImmGetContext )
+                return sTheInstance.mImmGetContext(hwnd); 
+        return 0;
+}
+
+//static 
+BOOL            LLWinImm::releaseContext(HWND hwnd, HIMC himc)
+{ 
+        if ( sTheInstance.mImmIsIME )
+                return sTheInstance.mImmReleaseContext(hwnd, himc); 
+        return FALSE;
+}
+
+// static 
+BOOL            LLWinImm::getOpenStatus(HIMC himc)
+{ 
+        if ( sTheInstance.mImmGetOpenStatus )
+                return sTheInstance.mImmGetOpenStatus(himc); 
+        return FALSE;
+}
+
+// static 
+BOOL            LLWinImm::setOpenStatus(HIMC himc, BOOL status)                                                                 
+{ 
+        if ( sTheInstance.mImmSetOpenStatus )
+                return sTheInstance.mImmSetOpenStatus(himc, status); 
+        return FALSE;
+}
+
+// static 
+BOOL            LLWinImm::getConversionStatus(HIMC himc, LPDWORD conversion, LPDWORD sentence)  
+{ 
+        if ( sTheInstance.mImmGetConversionStatus )
+                return sTheInstance.mImmGetConversionStatus(himc, conversion, sentence); 
+        return FALSE;
+}
+
+// static 
+BOOL            LLWinImm::setConversionStatus(HIMC himc, DWORD conversion, DWORD sentence)              
+{ 
+        if ( sTheInstance.mImmSetConversionStatus )
+                return sTheInstance.mImmSetConversionStatus(himc, conversion, sentence); 
+        return FALSE;
+}
+
+// static 
+BOOL            LLWinImm::getCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form)                                       
+{ 
+        if ( sTheInstance.mImmGetCompostitionWindow )
+                return sTheInstance.mImmGetCompostitionWindow(himc, form);      
+        return FALSE;
+}
+
+// static 
+BOOL            LLWinImm::setCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form)                                       
+{ 
+        if ( sTheInstance.mImmSetCompostitionWindow )
+                return sTheInstance.mImmSetCompostitionWindow(himc, form);      
+        return FALSE;
+}
+
+
+// ----------------------------------------------------------------------------------------
 LLWinImm::~LLWinImm()
 {
         if (mHImmDll != NULL)
@@ -3222,53 +3324,74 @@ void LLWindowWin32::focusClient()
 
 void LLWindowWin32::allowLanguageTextInput(BOOL b)
 {
-        if (b == sLanguageTextInputAllowed || !LLWinImm::isAvailable())
+        if ( !LLWinImm::isAvailable() )
         {
-                /* Not actually allowing/disallowing.  Do nothing.  */
                 return;
         }
         sLanguageTextInputAllowed = b;
 
         if (b)
         {
-                /* Allowing: Restore the previous IME status, 
-                   so that the user has a feeling that the previous 
-                   text input continues naturally.  Be careful, however,
-                   the IME status is meaningful only during the user keeps 
-                   using same Input Locale (aka Keyboard Layout).  */
-                if (sWinIMEOpened && GetKeyboardLayout(0) == sWinInputLocale)
+                // Allowing: Restore the previous IME status, so that the user has a feeling that the previous 
+                // text input continues naturally.  Be careful, however, the IME status is meaningful only during the user keeps 
+                // using same Input Locale (aka Keyboard Layout).
+                HIMC himc = LLWinImm::getContext(mWindowHandle);
+                LLWinImm::setOpenStatus(himc, TRUE);
+                if (GetKeyboardLayout(0) == sWinInputLocale && sWinIMEConversionMode != IME_CMODE_RESERVED)
                 {
-                        HIMC himc = LLWinImm::getContext(mWindowHandle);
-                        LLWinImm::setOpenStatus(himc, TRUE);
                         LLWinImm::setConversionStatus(himc, sWinIMEConversionMode, sWinIMESentenceMode);
-                        LLWinImm::releaseContext(mWindowHandle, himc);
+                        sWinIMEConversionMode = IME_CMODE_RESERVED;             // Set saved state so we won't do this repeatedly
                 }
+                LLWinImm::releaseContext(mWindowHandle, himc);
         }
         else
         {
-                /* Disallowing: Turn off the IME so that succeeding 
-                   key events bypass IME and come to us directly.
-                   However, do it after saving the current IME 
-                   status.  We need to restore the status when
-                   allowing language text input again.  */
+                // Disallowing: Turn off the IME so that succeeding key events bypass IME and come to us directly.
+                // However, do it after saving the current IME  status.  We need to restore the status when
+                //   allowing language text input again.
                 sWinInputLocale = GetKeyboardLayout(0);
-                sWinIMEOpened = LLWinImm::isIME(sWinInputLocale);
-                if (sWinIMEOpened)
+                if ( LLWinImm::isIME(sWinInputLocale) )
                 {
                         HIMC himc = LLWinImm::getContext(mWindowHandle);
-                        sWinIMEOpened = LLWinImm::getOpenStatus(himc);
-                        if (sWinIMEOpened)
+                        if ( LLWinImm::getOpenStatus(himc) )
                         {
                                 LLWinImm::getConversionStatus(himc, &sWinIMEConversionMode, &sWinIMESentenceMode);
 
-                                /* We need both ImmSetConversionStatus and ImmSetOpenStatus here
-                                   to surely disable IME's keyboard hooking, because Some IME reacts 
-                                   only on the former and some other on the latter...  */
+                                // We need both ImmSetConversionStatus and ImmSetOpenStatus here to surely disable IME's 
+                                // keyboard hooking, because Some IME reacts only on the former and some other on the latter...
                                 LLWinImm::setConversionStatus(himc, IME_CMODE_NOCONVERSION, sWinIMESentenceMode);
                                 LLWinImm::setOpenStatus(himc, FALSE);
                         }
                         LLWinImm::releaseContext(mWindowHandle, himc);
+                }
+        }
+
+}
+
+
+// Put the IME window at the right place (near current text input).   Point coordinates should be the top of the current text line.
+void LLWindowWin32::setLanguageTextInput( const LLCoordGL & position )
+{
+        if (sLanguageTextInputAllowed && LLWinImm::isAvailable())
+        {
+                HIMC himc = LLWinImm::getContext(mWindowHandle);
+
+                LLCoordWindow win_pos;
+                convertCoords( position, &win_pos );
+
+                if ( win_pos.mX >= 0 && win_pos.mY >= 0 )
+                {
+                        COMPOSITIONFORM ime_form;
+                        memset( &ime_form, 0, sizeof(ime_form) );
+                        ime_form.dwStyle = CFS_POINT;
+                        ime_form.ptCurrentPos.x = win_pos.mX;
+                        ime_form.ptCurrentPos.y = win_pos.mY;
+
+                        LLWinImm::setCompositionWindow( himc, &ime_form );
                 }
+
+                LLWinImm::releaseContext(mWindowHandle, himc);
+
         }
 }
 
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 0f0cf7c..938ece9 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -2,6 +2,8 @@
  * @file llwindowwin32.h
  * @brief Windows implementation of LLWindow class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLWINDOWWIN32_H
@@ -107,6 +110,7 @@ public:
         /*virtual*/ void focusClient();
 
         /*virtual*/ void allowLanguageTextInput(BOOL b);
+        /*virtual*/ void setLanguageTextInput( const LLCoordGL & pos );
 
 protected:
         LLWindowWin32(
@@ -176,11 +180,10 @@ protected:
         BOOL            mMousePositionModified;
         BOOL            mInputProcessingPaused;
 
-        // The following five variables are for Language Text Input control.
+        // The following variables are for Language Text Input control.
         // They are all static, since one context is shared by all LLWindowWin32
         // instances.
         static BOOL             sLanguageTextInputAllowed;
-        static BOOL             sWinIMEOpened;
         static HKL              sWinInputLocale;
         static DWORD    sWinIMEConversionMode;
         static DWORD    sWinIMESentenceMode;