From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/lscript/lscript_compile/lscript_bytecode.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/lscript/lscript_compile/lscript_bytecode.h')

diff --git a/indra/lscript/lscript_compile/lscript_bytecode.h b/indra/lscript/lscript_compile/lscript_bytecode.h
index fcc5a23403..28505a12a9 100644
--- a/indra/lscript/lscript_compile/lscript_bytecode.h
+++ b/indra/lscript/lscript_compile/lscript_bytecode.h
@@ -56,8 +56,8 @@ public:
 
 	void addByte(U8 byte);
 	void addU16(U16 data);
-	void addBytes(U8 *bytes, S32 size);
-	void addBytes(char *bytes, S32 size);
+	void addBytes(const U8 *bytes, S32 size);
+	void addBytes(const char *bytes, S32 size);
 	void addBytes(S32 size);
 	void addBytesDontInc(S32 size);
 	void addInteger(S32 value);
-- 
cgit v1.2.3