summaryrefslogtreecommitdiff
path: root/indra/llwindow/llkeyboard.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-25 15:58:08 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-25 15:58:08 +0100
commit1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (patch)
tree70eb3619b9a3df35687836d9daa328eb52ba85ab /indra/llwindow/llkeyboard.cpp
parent6fcde580c3a2e6cc62bfab52bd47cae8726c56d4 (diff)
parente416840f85dc4a367894036b9fe483f17d959c54 (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;
}