summaryrefslogtreecommitdiff
path: root/indra/llwindow/llkeyboard.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-08-26 21:45:20 -0700
committerMerov Linden <merov@lindenlab.com>2010-08-26 21:45:20 -0700
commitdbe965eaa1864ff71e365608488a5015172a24ed (patch)
treef3a7f10360a50a09ca1267fd204802507b079a17 /indra/llwindow/llkeyboard.cpp
parent6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff)
parent838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff)
Sync with 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;
}