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/lldelayedgestureerror.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/lldelayedgestureerror.h b/indra/newview/lldelayedgestureerror.h
index 8430a9b848..090940b7c2 100644
--- a/indra/newview/lldelayedgestureerror.h
+++ b/indra/newview/lldelayedgestureerror.h
@@ -61,10 +61,10 @@ private:
 
 	struct LLErrorEntry
 	{
-		LLErrorEntry(const LLString& notify, const LLUUID &item) : mTimer(), mNotifyName(notify), mItemID(item) {}
+		LLErrorEntry(const std::string& notify, const LLUUID &item) : mTimer(), mNotifyName(notify), mItemID(item) {}
 
 		LLTimer mTimer;
-		LLString mNotifyName;
+		std::string mNotifyName;
 		LLUUID mItemID;
 	};
 
-- 
cgit v1.2.3