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

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h
index 07ea638b7f..cd02843ccf 100644
--- a/indra/newview/llwearable.h
+++ b/indra/newview/llwearable.h
@@ -85,11 +85,11 @@ public:
 	EWearableType		getType() const							{ return mType; }
 	void				setType( EWearableType type )			{ mType = type; }
 
-	void				setName( const std::string& name )				{ mName = name; }
-	const std::string&	getName()								{ return mName; }
+	void				setName( const LLString& name )			{ mName = name; }
+	const LLString&		getName()								{ return mName; }
 
-	void				setDescription( const std::string& desc )		{ mDescription = desc; }
-	const std::string&	getDescription()						{ return mDescription; }
+	void				setDescription( const LLString& desc )	{ mDescription = desc; }
+	const LLString&		getDescription()						{ return mDescription; }
 
 	void				setPermissions( const LLPermissions& p ) { mPermissions = p; }
 	const LLPermissions& getPermissions()						{ return mPermissions; }