summaryrefslogtreecommitdiff
path: root/indra/newview/llkeyconflict.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-11-10 19:06:03 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-23 14:50:05 +0300
commit5568018bd20a43c30caca0c6288e63bfae29a2e3 (patch)
treea5d81dbebe5601230d95b8a1c45dc1b2a577e6ca /indra/newview/llkeyconflict.h
parente7d383be8a9734a5008690b8a7e1b179e2f2a718 (diff)
SL-6109 Better key and table localization support and fix for key-replacing
Diffstat (limited to 'indra/newview/llkeyconflict.h')
-rw-r--r--indra/newview/llkeyconflict.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llkeyconflict.h b/indra/newview/llkeyconflict.h
index 48af0ccdfe..84730e4d4f 100644
--- a/indra/newview/llkeyconflict.h
+++ b/indra/newview/llkeyconflict.h
@@ -86,6 +86,7 @@ public:
LLKeyData getControl(const std::string &control_name, U32 data_index);
+ // localized string
static std::string getStringFromKeyData(const LLKeyData& keydata);
std::string getControlString(const std::string &control_name, U32 data_index);