From bc12956a304c0c9c8d67a86a4e6d2e108026c169 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 19 Aug 2010 13:59:46 -0700
Subject: [PATCH] Fix for bad accelerator string lookups
---
indra/llxuixml/lltrans.h | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h
index 6c8d28b346a..30c96f81215 100644
--- a/indra/llxuixml/lltrans.h
+++ b/indra/llxuixml/lltrans.h
@@ -107,7 +107,16 @@ class LLTrans
{
std::string key_str(keystring);
std::string trans_str;
- return findString(trans_str, "Key_" + key_str) ? trans_str : key_str;
+ if (findString(trans_str, "Key_" + key_str))
+ {
+ return trans_str;
+ }
+ else if (findString(trans_str, key_str))
+ {
+ return trans_str;
+ }
+ llwarns << "Failed to find keyboard string " << keystring << llendl;
+ return key_str;
}
// get the default args
--
GitLab