svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
index 16319ef621..43911f4ed7 100644
--- a/indra/llcharacter/llvisualparam.h
+++ b/indra/llcharacter/llvisualparam.h
@@ -119,9 +119,9 @@ public:
 	const LLString&			getMaxDisplayName() const	{ return mInfo->mMaxName; }
 	const LLString&			getMinDisplayName() const	{ return mInfo->mMinName; }
 
-	void					setDisplayName(const char* s) 	 { mInfo->mDisplayName = s; }
-	void					setMaxDisplayName(const char* s) { mInfo->mMaxName = s; }
-	void					setMinDisplayName(const char* s) { mInfo->mMinName = s; }
+	void					setDisplayName(const LLString& s) 	 { mInfo->mDisplayName = s; }
+	void					setMaxDisplayName(const LLString& s) { mInfo->mMaxName = s; }
+	void					setMinDisplayName(const LLString& s) { mInfo->mMinName = s; }
 
 	EVisualParamGroup		getGroup() 			{ return mInfo->mGroup; }
 	F32						getMinWeight() 		{ return mInfo->mMinWeight; }