summaryrefslogtreecommitdiff
path: root/indra/llwindow/llkeyboard.cpp
diff options
context:
space:
mode:
authorAaron Terrell (Enus) <enus@lindenlab.com>2010-08-30 11:56:33 -0700
committerAaron Terrell (Enus) <enus@lindenlab.com>2010-08-30 11:56:33 -0700
commitd04e8d757575dbb50877ef861adcfde427837bb6 (patch)
treeb214237a4246e523754b356b003d1d2a163f21ab /indra/llwindow/llkeyboard.cpp
parent3172b4db1ee4d2059d2605ce616bdb10c840fc03 (diff)
parentd84c6625c707b5d61b71749b74f3cc4fb8f02048 (diff)
merging up from viewer-development
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;
}