svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated

1 files changed, 9 insertions, 5 deletions

diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h
index 4c25c097d8..57228dd24c 100644
--- a/indra/lscript/lscript_compile/lscript_tree.h
+++ b/indra/lscript/lscript_compile/lscript_tree.h
@@ -2197,11 +2197,11 @@ public:
 	void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
 	S32 getSize();
 
-	LSCRIPTStateType		mType;
-	LLScriptIdentifier		*mIdentifier;
-	LLScriptEventHandler	*mEvent;
-	LLScriptState			*mNextp;
-
+	LSCRIPTStateType mType;
+	LLScriptIdentifier *mIdentifier;
+	LLScriptEventHandler *mEvent;
+	LLScriptState *mNextp;
+	LLScriptScope *mStateScope;
 };
 
 class LLScritpGlobalStorage : public LLScriptFilePosition
@@ -2262,6 +2262,9 @@ public:
 
 	void setBytecodeDest(const char* dst_filename);
 
+	void setClassName(const char* class_name);
+	const char* getClassName() {return mClassName;}
+
 	LLScriptState			*mStates;
 	LLScriptScope			*mGlobalScope;
 	LLScriptGlobalVariable	*mGlobals;
@@ -2270,6 +2273,7 @@ public:
 
 private:
 	std::string mBytecodeDest;
+	char mClassName[MAX_STRING];
 };
 
 class LLScriptAllocationManager