From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 20 Jul 2007 20:38:05 +0000
Subject: svn merge -r 64548:64837
 svn+ssh://svn/svn/linden/branches/maintenance into release * WARNING *: 
 maintenance r64837 is not the last rev to use in the next merge. use r65269

---
 indra/llmessage/llnamevalue.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llmessage/llnamevalue.h')

diff --git a/indra/llmessage/llnamevalue.h b/indra/llmessage/llnamevalue.h
index 27355277ca..f3d0d0d338 100644
--- a/indra/llmessage/llnamevalue.h
+++ b/indra/llmessage/llnamevalue.h
@@ -174,7 +174,6 @@ public:
 	ENameValueSendto			mSendto;
 
 	UNameValueReference			mNameValueReference;
-	S32							mNumberEntries;
 	LLStringTable				*mNVNameTable;
 	TNameValueCallback			mNameValueCB;
 	void						**mUserData;
-- 
cgit v1.2.3