From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 26 Jun 2008 00:39:00 +0000
Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
 dataserver-is-deprecated

---
 indra/newview/llgroupmgr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llgroupmgr.h')

diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index 2cab236954..cbfeca31e1 100644
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -343,7 +343,7 @@ public:
 	static void processEjectGroupMemberReply(LLMessageSystem* msg, void ** data);
 	static void processLeaveGroupReply(LLMessageSystem* msg, void ** data);
 
-	static bool parseRoleActions(const LLString& xml_filename);
+	static bool parseRoleActions(const std::string& xml_filename);
 
 	std::vector<LLRoleActionSet*> mRoleActionSets;
 
-- 
cgit v1.2.3