summaryrefslogtreecommitdiff
path: root/indra/newview/llfirstuse.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llfirstuse.h
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfirstuse.h')
-rw-r--r--indra/newview/llfirstuse.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h
index 92c3da6f44..7747c0f177 100644
--- a/indra/newview/llfirstuse.h
+++ b/indra/newview/llfirstuse.h
@@ -79,7 +79,7 @@ class LLFirstUse
{
public:
// Add a config variable to be reset on resetFirstUse()
- static void addConfigVariable(const LLString& var);
+ static void addConfigVariable(const std::string& var);
// Sets all controls back to show the dialogs.
static void disableFirstUse();
@@ -107,7 +107,7 @@ public:
static void useMedia();
protected:
- static std::set<LLString> sConfigVariables;
+ static std::set<std::string> sConfigVariables;
};
#endif