summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-19 13:59:46 -0700
committerRichard Linden <none@none>2010-08-19 13:59:46 -0700
commitbc12956a304c0c9c8d67a86a4e6d2e108026c169 (patch)
tree046d2b86f1760b284ca916a5e8933f9dc1e492c6
parentaa8db56fff94aac4866a187e7c7c8488866a991b (diff)
Fix for bad accelerator string lookups
-rw-r--r--indra/llxuixml/lltrans.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h
index 6c8d28b346..30c96f8121 100644
--- a/indra/llxuixml/lltrans.h
+++ b/indra/llxuixml/lltrans.h
@@ -107,7 +107,16 @@ public:
{
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