diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
| commit | 05e15ccb82541494bf7145652140de187d838cda (patch) | |
| tree | 59e7772de3cd038bf1e1e222abbb7f0cdf315331 /indra/llplugin/llpluginprocesschild.h | |
| parent | 1805369b58d98677c726bb0bcb52618bd66e8fdd (diff) | |
| parent | 56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff) | |
merge from viewer2.
Diffstat (limited to 'indra/llplugin/llpluginprocesschild.h')
| -rw-r--r-- | indra/llplugin/llpluginprocesschild.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h index 1cfd9dcaf9..58f8935ed1 100644 --- a/indra/llplugin/llpluginprocesschild.h +++ b/indra/llplugin/llpluginprocesschild.h @@ -89,8 +89,9 @@ private: STATE_ERROR, // generic bailout state STATE_DONE // state machine will sit in this state after either error or normal termination. }; - EState mState; void setState(EState state); + + EState mState; LLHost mLauncherHost; LLSocket::ptr_t mSocket; |