QAR-628 merge string-cleanup-5 -r 90476:90508 -> release

dataserver-is-deprecated

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
index 63d19c27dc..84ae8f6e82 100644
--- a/indra/newview/llprogressview.h
+++ b/indra/newview/llprogressview.h
@@ -52,20 +52,20 @@ public:
 	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
 	/*virtual*/ void setVisible(BOOL visible);
 
-	void setText(const LLString& text);
+	void setText(const std::string& text);
 	void setPercent(const F32 percent);
 
 	// Set it to NULL when you want to eliminate the message.
-	void setMessage(const LLString& msg);
+	void setMessage(const std::string& msg);
 	
-	void setCancelButtonVisible(BOOL b, const LLString& label);
+	void setCancelButtonVisible(BOOL b, const std::string& label);
 
 	static void onCancelButtonClicked( void* );
 
 protected:
 	F32 mPercentDone;
-	LLString mText;
-	LLString mMessage;
+	std::string mText;
+	std::string mMessage;
 	LLButton*	mCancelBtn;
 	LLFrameTimer	mFadeTimer;
 	LLFrameTimer mProgressTimer;