Backed out changeset a62bf7c0af21

Backing out this merge that I pushed (prematurely) to the wrong place.

1 files changed, 5 insertions, 6 deletions

diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h
index 42c27b6976..5c90695598 100644
--- a/indra/llxuixml/lltrans.h
+++ b/indra/llxuixml/lltrans.h
@@ -97,12 +97,11 @@ public:
 		return findString(result, xml_desc, empty);
 	}
 
-	static std::string getKeyboardString(const char* keystring)
-	{
-		std::string key_str(keystring);
-		std::string trans_str;
-		return findString(trans_str, key_str) ? trans_str : key_str; 
-	}
+        static std::string getKeyboardString(const char* keystring)
+        {
+                // These map directly - no need to specialize
+                return getString( ll_safe_string(keystring) );
+        }
 
 	// get the default args
 	static const LLStringUtil::format_map_t& getDefaultArgs()