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_byteformat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/lscript/lscript_byteformat.h')

diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h
index 4e8f13f68a..6edf2b740d 100644
--- a/indra/lscript/lscript_byteformat.h
+++ b/indra/lscript/lscript_byteformat.h
@@ -515,7 +515,7 @@ typedef enum e_lscript_runtime_faults
 	LSRF_EOF
 } LSCRIPTRunTimeFaults;
 
-extern char* LSCRIPTRunTimeFaultStrings[LSRF_EOF]; 	/*Flawfinder: ignore*/
+extern const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF]; 	/*Flawfinder: ignore*/
 
 const S32 LSCRIPTRunTimeFaultBits[LSRF_EOF] =
 {
-- 
cgit v1.2.3