Second Life viewer sources 1.18.5.0-RC

6 files changed, 464 insertions, 16 deletions

diff --git a/linden/indra/llwindow/lllogitechlcd.cpp b/linden/indra/llwindow/lllogitechlcd.cpp
new file mode 100644
index 0000000..8141ba3
--- /dev/null
+++ b/linden/indra/llwindow/lllogitechlcd.cpp
@@ -0,0 +1,296 @@
+/** 
+ * @file lcd.cpp
+ * @brief cLcd panel class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * 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://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * 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 "llpreprocessor.h"
+
+#if LL_LCD_COMPILE
+
+#include "linden_common.h"
+#include "../win_crash_logger/StdAfx.h"
+
+#include "EZ_LCD.h"
+#include "../newview/res/resource.h"
+#include "llcontrol.h"
+extern LLControlGroup gSavedSettings;
+
+#ifndef LL_LOGITECH_LCD_H
+#include "lllogitechlcd.h"
+#endif
+
+#define WAIT_DURATION 7
+#define DEBOUNCE_DURATION 0.3f
+
+llLCDPageGroup::llLCDPageGroup(CEzLcd *LCD, int type, HICON SLIcon):
+mType(type),
+mSLIcon(SLIcon),
+mDisplayPage(false),
+mLCD(LCD)
+{
+        mPageArray.clear();     
+}
+
+llLCDPageGroup::~llLCDPageGroup()
+{
+        mPageArray.clear();
+}
+
+void llDefaultPageGroup::UpdateDetails()
+{
+        mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex);
+}
+
+void llDefaultPageGroup::GetDisplayable()
+{
+
+}
+
+llDefaultPageGroup::llDefaultPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
+:llLCDPageGroup(LCD, type, SLIcon)
+{
+        // create a new specific page
+        llLCDSpecificPage newPage;
+        newPage.mPageIndex = mLCD->AddNewPage() - 1;
+        mLCD->ModifyControlsOnPage(newPage.mPageIndex);
+
+        // add in all the display parts for this specific page
+
+        // add in the icon - all pages have this - we don't need to track this because we never update it
+        HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
+        mLCD->SetOrigin(m_rightIcon, 0, 0);
+
+        // add Title
+        HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_MEDIUM, DT_CENTER, 128);
+        mLCD->SetOrigin(title, 32, 20);
+        mLCD->SetText(title, _T("Second Life Display"));
+        newPage.mDisplayItemArray.push_back(title);
+
+        // and then insert it
+        mPageArray.push_back(newPage);
+}
+
+llLCD::llLCD(HINSTANCE instance):
+mInited(false),
+mDisplayTimer(),
+mDebounceTimer(),
+mPageToShow(-1),
+mInstance(instance),
+mDestinationLCD(-1),
+mFirstTimeThru(true)
+{
+        HRESULT     res_ = S_OK;
+
+        // Create instance of EzLcd.
+        mLCD = new CEzLcd();
+
+        // Have it initialize itself
+        res_ = mLCD->InitYourself(_T("Second Life"));
+
+        if (res_ != S_OK)
+        {
+                // Something went wrong, when connecting to the LCD Manager software. We need to get out now
+                delete mLCD;
+                return;
+        }
+        mInited = true;
+
+        // preload the Second Life Icon
+        mSLIcon = static_cast<HICON>(LoadImage(mInstance,
+                MAKEINTRESOURCE(IDI_LCD_LL_ICON),
+                IMAGE_ICON, 
+                32, 
+                32, 
+                LR_MONOCHROME));
+
+        // have to do this first so screens are added to the list and updateDisplay actually does something.
+        mLCD->Update();
+}
+
+llLCD::~llLCD()
+{
+        // remove the instance of the LCD controller
+        if (mInited == true)
+        {
+                delete mLCD;
+
+                // free up the used pages
+                int loopSize = mPageGroupArray.size();
+                for(int i= 0; i<loopSize; i++)
+                {
+                        free (mPageGroupArray[i]);
+                }
+        }
+}
+
+llLCDPageGroup *llLCD::GetNextPageToDisplay()
+{
+        // find group with current page in it.
+
+        int groupSize = mPageGroupArray.size();
+        for(int x=1; x< groupSize; x++)
+        {
+                if (mPageGroupArray[x]->mDisplayPage)
+                {
+                        // now walk all the pages in the page group we are looking at
+                        int numPages = mPageGroupArray[x]->mPageArray.size();
+                        for (int zx = 0; zx< numPages; zx++)
+                        {
+                                // found it.
+                                if (mPageToShow == mPageGroupArray[x]->mPageArray[zx].mPageIndex)
+                                {
+                                        // move to the next one
+                                        if (zx < numPages-1)
+                                        {
+                                                mPageToShow = mPageGroupArray[x]->mPageArray[zx+1].mPageIndex;
+                                                return mPageGroupArray[x];
+                                        }
+                                        else
+                                        {
+                                                for(int y=x+1; y< groupSize; y++)
+                                                {
+                                                        if (mPageGroupArray[y]->mDisplayPage)
+                                                        {
+                                                                mPageToShow = mPageGroupArray[y]->mPageArray[0].mPageIndex;
+                                                                return mPageGroupArray[y];
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+
+        // ok, didn't find it. Start again at the beginning and find the first group that's enabled
+        for(int x=1; x< groupSize; x++)
+        {
+                if (mPageGroupArray[x]->mDisplayPage)
+                {
+                        mPageToShow = mPageGroupArray[x]->mPageArray[0].mPageIndex;
+                        return mPageGroupArray[x];
+                }
+        }
+        // if we got this far, we should display the default screen
+        mPageToShow = mPageGroupArray[0]->mPageArray[0].mPageIndex;
+        return mPageGroupArray[0];
+}
+
+void llLCD::SetUpDisplayPages()
+{
+        // work out if destination has changed
+        int destinationLCD = gSavedSettings.getS32("LCDDestination");
+        switch(destinationLCD)
+        {
+        case 0:
+                destinationLCD = LGLCD_DEVICE_FAMILY_KEYBOARD_G15;
+                break;
+        case 1:
+                destinationLCD = LGLCD_DEVICE_FAMILY_SPEAKERS_Z10;
+                break;
+        }
+        // set destination if it's changed
+        if (mDestinationLCD != destinationLCD)
+        {
+                mDestinationLCD = destinationLCD;
+                mLCD->SetDeviceFamilyToUse(destinationLCD);
+        }
+        int loopSize = mPageGroupArray.size();
+        for(int i= 0; i<loopSize; i++)
+        {
+                mPageGroupArray[i]->GetDisplayable();
+        }
+}
+
+void llLCD::UpdateDisplay()
+{
+        if (mInited)
+        {
+                // reset pages if anything has changed
+                SetUpDisplayPages();
+                if (mLCD->IsConnected())
+                {               
+                        // Switching back and forth between the pages that we've created
+                        if (mDisplayTimer.getElapsedTimeF32() > WAIT_DURATION || mFirstTimeThru)
+                        {
+                                mCurrentGroupBeingShown = GetNextPageToDisplay();
+                                mDisplayTimer.reset();
+                                mFirstTimeThru = false;
+                        }
+
+                        // Check if button 1 triggered
+                        if ((mLCD->ButtonIsPressed(LG_BUTTON_1)
+                                || mLCD->ButtonIsPressed(LG_BUTTON_2)
+                                || mLCD->ButtonIsPressed(LG_BUTTON_3)
+                                || mLCD->ButtonIsPressed(LG_BUTTON_4)
+                                ) && mDebounceTimer.getElapsedTimeF32() > DEBOUNCE_DURATION)
+                        {
+                                // if so, move us on a page
+                                mCurrentGroupBeingShown = GetNextPageToDisplay();
+                                mDisplayTimer.reset();
+                                mDebounceTimer.reset();
+                        }
+
+                        // update that which is being show
+                        mCurrentGroupBeingShown->UpdateDetails();
+                        
+                        // set which page is shown
+                        mLCD->ShowPage(mPageToShow);
+
+                        // Must run the following every loop.
+                        mLCD->Update();
+                }
+        }
+}
+
+
+// accessor functions
+bool llLCD::Enabled()
+{
+        return mInited;
+}
+
+BOOL llLCD::AreZ10Available()
+{
+        if (mInited == true)
+        {
+                return mLCD->AnyDeviceOfThisFamilyPresent(LGLCD_DEVICE_FAMILY_SPEAKERS_Z10);
+        }
+        return false;
+}
+
+BOOL llLCD::IsG15Available()
+{
+        if (mInited == true)
+        {
+                return mLCD->AnyDeviceOfThisFamilyPresent(LGLCD_DEVICE_FAMILY_KEYBOARD_G15);
+        }
+        return false;
+}
+
+#endif
diff --git a/linden/indra/llwindow/lllogitechlcd.h b/linden/indra/llwindow/lllogitechlcd.h
new file mode 100644
index 0000000..6804bef
--- /dev/null
+++ b/linden/indra/llwindow/lllogitechlcd.h
@@ -0,0 +1,135 @@
+/** 
+ * @file lcd.h
+ * @brief Description of the LCD owner class.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * 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://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * 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_LOGITECH_LCD_H
+#define LL_LOGITECH_LCD_H
+
+#include <vector>
+#include "llFrametimer.h"
+
+class CEzLcd;
+
+// TO Add a new display page groups, duplicate the Region or Debug or Chat class, then modify what's actually displayed (ie how many pages and whats in them)
+// in the constructor and update display functions.
+// Remember to add in a new enum type for the new display type, and add in functions to actually create/update or remove this page in the SetupDisplayPages function
+// And, of course, add the new option to the Menu in llpanelLCDoption.xml, and save details (duplicate the ones for debug or region).
+
+// this defines one pages worth of display items.
+class llLCDSpecificPage
+{
+public:
+        int mPageIndex;
+        typedef std::vector<HANDLE> displayItemArray_t;
+        // array of indexes that come from the lcd display sdk for specific items being displayed on a given page
+        displayItemArray_t mDisplayItemArray;
+};
+
+// this defines a group of pages - associated with a specific type of display, like Debug, Linden Account info, region etc
+// NOTE this can have more than one page associated with it - so it has an array of cLCDSpecificPage for each page.
+class llLCDPageGroup
+{
+public:
+        llLCDPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
+        virtual ~llLCDPageGroup();
+        virtual void UpdateDetails() = 0; 
+        virtual void GetDisplayable() = 0;
+        int             mType;
+        HANDLE  mHandle;
+        typedef std::vector<llLCDSpecificPage> pageArray_t;
+        pageArray_t mPageArray;
+        BOOL    mDisplayPage;
+protected:
+
+        CEzLcd  *mLCD;
+        HICON   mSLIcon;
+};
+
+
+// class that defines the Default page - used if nothing else is enabled
+class llDefaultPageGroup : public llLCDPageGroup
+{
+public:
+        llDefaultPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
+        virtual void UpdateDetails();
+        virtual void GetDisplayable();
+};
+
+// Root class - contains pointers to actual LCD display object, and arrays of page groups to be displayed
+class llLCD
+{
+public:
+        enum
+        {
+                kLCDDefault,
+                kLCDDebug,
+                kLCDChat,
+                kLCDRegion,
+                kLCDLinden,
+                kLCDIM,
+                kLCDDebugConsole,
+                kMaxLCDPageGroups
+        };
+        llLCD(HINSTANCE instance);
+        ~llLCD();
+        void UpdateDisplay();
+        bool Enabled();
+        BOOL AreZ10Available();
+        BOOL IsG15Available();
+
+        typedef std::vector<llLCDPageGroup *> pageGroupArray_t;
+        pageGroupArray_t mPageGroupArray;
+        HICON mSLIcon;
+        CEzLcd  *mLCD;
+private:
+
+        // member functions to display data
+        void SetUpDisplayPages();
+        llLCDPageGroup *GetNextPageToDisplay();
+
+        llLCDPageGroup *mCurrentGroupBeingShown;
+
+        // members
+        bool mInited;
+        
+        int     mPageToShow;
+        LLFrameTimer    mDisplayTimer;
+        LLFrameTimer    mDebounceTimer;
+        HINSTANCE mInstance;            // necessary for loading some icons for the dot matrix LCD display to use
+        bool mFirstTimeThru;
+
+
+        // actual display set up variables
+        int mDestinationLCD;
+};
+
+
+
+#endif
\ No newline at end of file
diff --git a/linden/indra/llwindow/llwindow.vcproj b/linden/indra/llwindow/llwindow.vcproj
index f2f4e32..cb49783 100644
--- a/linden/indra/llwindow/llwindow.vcproj
+++ b/linden/indra/llwindow/llwindow.vcproj
@@ -19,7 +19,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"
@@ -106,7 +106,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\GLMESA;..\..\libraries\i686-win32\include;..\..\libraries\include\"
+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\GLMESA;..\..\libraries\i686-win32\include;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;LL_MESA;LL_MESA_HEADLESS"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -151,7 +151,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
                                 StructMemberAlignment="0"
@@ -206,6 +206,9 @@
                                 RelativePath=".\llkeyboardwin32.cpp">
                         </File>
                         <File
+                                RelativePath=".\lllogitechlcd.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llwindow.cpp">
                         </File>
                         <File
@@ -244,6 +247,9 @@
                                 RelativePath=".\llkeyboardwin32.h">
                         </File>
                         <File
+                                RelativePath=".\lllogitechlcd.h">
+                        </File>
+                        <File
                                 RelativePath=".\llmousehandler.h">
                         </File>
                         <File
diff --git a/linden/indra/llwindow/llwindow_vc8.vcproj b/linden/indra/llwindow/llwindow_vc8.vcproj
index 803f11c..019d6a9 100644
--- a/linden/indra/llwindow/llwindow_vc8.vcproj
+++ b/linden/indra/llwindow/llwindow_vc8.vcproj
@@ -41,7 +41,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;Logitech_LCD;Logitech_LCD\LCDUI"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"

                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

                                 MinimalRebuild="true"

                                 BasicRuntimeChecks="3"

@@ -108,7 +108,7 @@
                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;Logitech_LCD;Logitech_LCD\LCDUI"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"

                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

                                 TreatWChar_tAsBuiltInType="false"

                                 ForceConformanceInForLoopScope="true"

@@ -171,7 +171,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\GLMESA;..\..\libraries\include\;Logitech_LCD;Logitech_LCD\LCDUI"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\GLMESA;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"

                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;LL_MESA;LL_MESA_HEADLESS"

                                 MinimalRebuild="true"

                                 BasicRuntimeChecks="3"

@@ -239,7 +239,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;Logitech_LCD;Logitech_LCD\LCDUI"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"

                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

                                 RuntimeLibrary="0"

                                 StructMemberAlignment="0"

@@ -305,6 +305,10 @@
                                 >

                         </File>

                         <File

+                                RelativePath=".\lllogitechlcd.cpp"

+                                >

+                        </File>

+                        <File

                                 RelativePath=".\llwindow.cpp"

                                 >

                         </File>

@@ -355,6 +359,10 @@
                                 >

                         </File>

                         <File

+                                RelativePath=".\lllogitechlcd.h"

+                                >

+                        </File>

+                        <File

                                 RelativePath=".\llmousehandler.h"

                                 >

                         </File>

diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index bb99d4c..c84611b 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -89,6 +89,7 @@ void show_window_creation_error(const char* title)
 BOOL LLWindowWin32::sIsClassRegistered = FALSE;
 
 BOOL    LLWindowWin32::sLanguageTextInputAllowed = TRUE;
+BOOL    LLWindowWin32::sWinIMEOpened = FALSE;
 HKL             LLWindowWin32::sWinInputLocale = 0;
 DWORD   LLWindowWin32::sWinIMEConversionMode = IME_CMODE_NATIVE;
 DWORD   LLWindowWin32::sWinIMESentenceMode = IME_SMODE_AUTOMATIC;
@@ -3324,7 +3325,7 @@ void LLWindowWin32::focusClient()
 
 void LLWindowWin32::allowLanguageTextInput(BOOL b)
 {
-        if ( !LLWinImm::isAvailable() )
+        if (b == sLanguageTextInputAllowed || !LLWinImm::isAvailable())
         {
                 return;
         }
@@ -3335,14 +3336,13 @@ void LLWindowWin32::allowLanguageTextInput(BOOL 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).
-                HIMC himc = LLWinImm::getContext(mWindowHandle);
-                LLWinImm::setOpenStatus(himc, TRUE);
-                if (GetKeyboardLayout(0) == sWinInputLocale && sWinIMEConversionMode != IME_CMODE_RESERVED)
+                if (sWinIMEOpened && GetKeyboardLayout(0) == sWinInputLocale)
                 {
+                        HIMC himc = LLWinImm::getContext(mWindowHandle);
+                        LLWinImm::setOpenStatus(himc, TRUE);
                         LLWinImm::setConversionStatus(himc, sWinIMEConversionMode, sWinIMESentenceMode);
-                        sWinIMEConversionMode = IME_CMODE_RESERVED;             // Set saved state so we won't do this repeatedly
+                        LLWinImm::releaseContext(mWindowHandle, himc);
                 }
-                LLWinImm::releaseContext(mWindowHandle, himc);
         }
         else
         {
@@ -3350,10 +3350,12 @@ void LLWindowWin32::allowLanguageTextInput(BOOL b)
                 // However, do it after saving the current IME  status.  We need to restore the status when
                 //   allowing language text input again.
                 sWinInputLocale = GetKeyboardLayout(0);
-                if ( LLWinImm::isIME(sWinInputLocale) )
+                sWinIMEOpened = LLWinImm::isIME(sWinInputLocale);
+                if (sWinIMEOpened)
                 {
                         HIMC himc = LLWinImm::getContext(mWindowHandle);
-                        if ( LLWinImm::getOpenStatus(himc) )
+                        sWinIMEOpened = LLWinImm::getOpenStatus(himc);
+                        if (sWinIMEOpened)
                         {
                                 LLWinImm::getConversionStatus(himc, &sWinIMEConversionMode, &sWinIMESentenceMode);
 
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 938ece9..f1e977e 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -184,6 +184,7 @@ protected:
         // 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;