svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.

1 files changed, 3 insertions, 2 deletions

diff --git a/indra/llmessage/llsdmessagereader.h b/indra/llmessage/llsdmessagereader.h
index 57851941a2..d6d9f3d2f9 100755
--- a/indra/llmessage/llsdmessagereader.h
+++ b/indra/llmessage/llsdmessagereader.h
@@ -69,10 +69,11 @@ public:
 
 	virtual void copyToBuilder(LLMessageBuilder&) const;
 
-	void setMessage(const std::string& name, const LLSD& msg);
+	/** Expects a pointer to a canonical name string */
+	void setMessage(const char* name, const LLSD& msg);
 
 private:
-	std::string mMessageName;
+	const char* mMessageName; // Canonical (prehashed) string.
 	LLSD mMessage;
 };