summaryrefslogtreecommitdiff
path: root/indra/llwindow/llkeyboard.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-08-26 17:09:10 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2010-08-26 17:09:10 -0700
commit66500c7ad5d799eb56f8f56924a00744f4a90e3d (patch)
treefcd42e2c1853cdd897128d79b5b18eebbe32a32a /indra/llwindow/llkeyboard.cpp
parent225dd434cfeb6a67c5878b41538dafe2a7f4a284 (diff)
parent1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff)
merge
Diffstat (limited to 'indra/llwindow/llkeyboard.cpp')
-rw-r--r--indra/llwindow/llkeyboard.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp
index 65a755e134..53cecf9d4a 100644
--- a/indra/llwindow/llkeyboard.cpp
+++ b/indra/llwindow/llkeyboard.cpp
@@ -337,6 +337,13 @@ std::string LLKeyboard::stringFromKey(KEY key)
buffer[1] = '\0';
res = std::string(buffer);
}
+
+ LLKeyStringTranslatorFunc *trans = gKeyboard->mStringTranslator;
+ if (trans != NULL)
+ {
+ res = trans(res.c_str());
+ }
+
return res;
}