From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan 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_execute.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/lscript/lscript_execute.h') diff --git a/indra/lscript/lscript_execute.h b/indra/lscript/lscript_execute.h index 5048f5a8d9..dd1aa97e71 100644 --- a/indra/lscript/lscript_execute.h +++ b/indra/lscript/lscript_execute.h @@ -372,7 +372,7 @@ public: ~LLScriptExecute(); void init(); - U32 run(BOOL b_print, const LLUUID &id, char **errorstr, BOOL &state_transition); + U32 run(BOOL b_print, const LLUUID &id, const char **errorstr, BOOL &state_transition); BOOL (*mExecuteFuncs[0x100])(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id); -- cgit v1.2.3