summaryrefslogtreecommitdiff
path: root/indra/llxuixml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-26 12:49:00 -0700
committerRichard Linden <none@none>2010-08-26 12:49:00 -0700
commit093e83386d5a132cc8947095f93ea6405aab6e3f (patch)
tree043184fa92c8a6a9f8e747eb13056616bb27ba20 /indra/llxuixml
parent2667c77a1cfb230ade472a047f46fd2bde7883c0 (diff)
parentce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff)
merge
Diffstat (limited to 'indra/llxuixml')
-rw-r--r--indra/llxuixml/lltrans.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h
index 4a99c5e0e2..84eeef0ace 100644
--- a/indra/llxuixml/lltrans.h
+++ b/indra/llxuixml/lltrans.h
@@ -107,15 +107,7 @@ public:
{
std::string key_str(keystring);
std::string trans_str;
- if (findString(trans_str, "Key_" + key_str))
- {
- return trans_str;
- }
- else if (findString(trans_str, key_str))
- {
- return trans_str;
- }
- return key_str;
+ return findString(trans_str, key_str) ? trans_str : key_str;
}
// get the default args