summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile/lscript_tree.h
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-02-13 19:05:21 -0500
committerKent Quirk <q@lindenlab.com>2010-02-13 19:05:21 -0500
commit0b579ba112e5e4fa5b5348f1c865a3083b5e1175 (patch)
tree599c506927d50f9a4a51c2f776e8fe954505e4d0 /indra/lscript/lscript_compile/lscript_tree.h
parent96f29d2ba0b66754b3b7b9e0f75deb198a84cb5f (diff)
parent9fee359d1baf6e0046655cb8e4afabb8774754b1 (diff)
Automated merge from viewer-2-0 to normalize beta 3
Diffstat (limited to 'indra/lscript/lscript_compile/lscript_tree.h')
-rw-r--r--indra/lscript/lscript_compile/lscript_tree.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h
index a667e1eb5b..7de9606dfc 100644
--- a/indra/lscript/lscript_compile/lscript_tree.h
+++ b/indra/lscript/lscript_compile/lscript_tree.h
@@ -1876,7 +1876,7 @@ class LLScriptStateChange : public LLScriptStatement
{
public:
LLScriptStateChange(S32 line, S32 col, LLScriptIdentifier *identifier)
- : LLScriptStatement(line, col, LSSMT_STATE_CHANGE), mIdentifier(identifier)
+ : LLScriptStatement(line, col, LSSMT_STATE_CHANGE), mIdentifier(identifier), mReturnType(LST_NULL)
{
}
@@ -2210,7 +2210,7 @@ class LLScriptState : public LLScriptFilePosition
{
public:
LLScriptState(S32 line, S32 col, LSCRIPTStateType type, LLScriptIdentifier *identifier, LLScriptEventHandler *event)
- : LLScriptFilePosition(line, col), mType(type), mIdentifier(identifier), mEvent(event), mNextp(NULL)
+ : LLScriptFilePosition(line, col), mType(type), mIdentifier(identifier), mEvent(event), mNextp(NULL), mStateScope(NULL)
{
}