diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/llui | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/llresmgr.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 5857f49a3e..d7ccfe1daa 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -2945,6 +2945,12 @@ BOOL LLMenuGL::handleKey( KEY key, MASK mask, BOOL called_from_parent ) BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask) { + // don't handle if not enabled + if(!mEnabled) + { + return FALSE; + } + // Pass down even if not visible item_list_t::iterator item_iter; for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter) diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index 0d78a45b26..68fb3f8e23 100644 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -420,6 +420,9 @@ const LLString LLLocale::SYSTEM_LOCALE("English_United States.1252"); #elif LL_DARWIN const LLString LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLString::null; const LLString LLLocale::SYSTEM_LOCALE("en_US.iso8859-1"); +#elif LL_SOLARIS +const LLString LLLocale::USER_LOCALE("en_US.ISO8859-1"); +const LLString LLLocale::SYSTEM_LOCALE("C"); #else // LL_LINUX likes this const LLString LLLocale::USER_LOCALE("en_US.utf8"); const LLString LLLocale::SYSTEM_LOCALE("C"); |