From 5ec8bbbe2244ea70d8aa74b5c572351632699425 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Wed, 10 Oct 2007 00:01:43 +0000 Subject: svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 --- indra/llcommon/llstring.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 649fcd41a6..70f7d5483e 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -321,6 +321,18 @@ template LLStringBase LLStringBase::null; typedef LLStringBase LLString; typedef LLStringBase LLWString; +//@ Use this where we want to disallow input in the form of "foo" +// This is used to catch places where english text is embedded in the code +// instead of in a translatable XUI file. +class LLStringExplicit : public LLString +{ +public: + explicit LLStringExplicit(const char* s) : LLString(s) {} + LLStringExplicit(const LLString& s) : LLString(s) {} + LLStringExplicit(const std::string& s) : LLString(s) {} + LLStringExplicit(const std::string& s, size_type pos, size_type n = std::string::npos) : LLString(s, pos, n) {} +}; + struct LLDictionaryLess { public: @@ -336,7 +348,7 @@ public: */ /** - * @breif chop off the trailing characters in a string. + * @brief chop off the trailing characters in a string. * * This function works on bytes rather than glyphs, so this will * incorrectly truncate non-single byte strings. -- cgit v1.2.3