summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroupgeneral.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/llpanelgroupgeneral.h
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.h')
-rw-r--r--indra/newview/llpanelgroupgeneral.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index 056d288094..982d0678dd 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -54,8 +54,8 @@ public:
// LLPanelGroupTab
static void* createTab(void* data);
virtual void activate();
- virtual bool needsApply(LLString& mesg);
- virtual bool apply(LLString& mesg);
+ virtual bool needsApply(std::string& mesg);
+ virtual bool apply(std::string& mesg);
virtual void cancel();
static void createGroupCallback(S32 option, void* user_data);
static void callbackConfirmMatureApply(S32 option, void* data);