aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llplugin/llpluginprocesschild.h
diff options
context:
space:
mode:
authorArmin Weatherwax2010-02-26 17:06:16 +0100
committerArmin Weatherwax2010-09-23 15:40:22 +0200
commitdcdfa1ebab37dd78282bc95093a5f347f5846b1c (patch)
tree22d6ea3f35b749e51ae4ac882bd56f42d35f9590 /linden/indra/llplugin/llpluginprocesschild.h
parentremove deprecated files (diff)
downloadmeta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.zip
meta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.tar.gz
meta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.tar.bz2
meta-impy-dcdfa1ebab37dd78282bc95093a5f347f5846b1c.tar.xz
port SG2.0 Mediaplugs (webkit supports flash now)
Diffstat (limited to 'linden/indra/llplugin/llpluginprocesschild.h')
-rwxr-xr-x[-rw-r--r--]linden/indra/llplugin/llpluginprocesschild.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llplugin/llpluginprocesschild.h b/linden/indra/llplugin/llpluginprocesschild.h
index 16a1ae8..8e9579e 100644..100755
--- a/linden/indra/llplugin/llpluginprocesschild.h
+++ b/linden/indra/llplugin/llpluginprocesschild.h
@@ -2,9 +2,10 @@
2 * @file llpluginprocesschild.h 2 * @file llpluginprocesschild.h
3 * @brief LLPluginProcessChild handles the child side of the external-process plugin API. 3 * @brief LLPluginProcessChild handles the child side of the external-process plugin API.
4 * 4 *
5 * @cond
5 * $LicenseInfo:firstyear=2008&license=viewergpl$ 6 * $LicenseInfo:firstyear=2008&license=viewergpl$
6 * 7 *
7 * Copyright (c) 2008-2009, Linden Research, Inc. 8 * Copyright (c) 2008-2010, Linden Research, Inc.
8 * 9 *
9 * Second Life Viewer Source Code 10 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 11 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
28 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 29 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
29 * COMPLETENESS OR PERFORMANCE. 30 * COMPLETENESS OR PERFORMANCE.
30 * $/LicenseInfo$ 31 * $/LicenseInfo$
32 * @endcond
31 */ 33 */
32 34
33#ifndef LL_LLPLUGINPROCESSCHILD_H 35#ifndef LL_LLPLUGINPROCESSCHILD_H
@@ -88,8 +90,9 @@ private:
88 STATE_ERROR, // generic bailout state 90 STATE_ERROR, // generic bailout state
89 STATE_DONE // state machine will sit in this state after either error or normal termination. 91 STATE_DONE // state machine will sit in this state after either error or normal termination.
90 }; 92 };
91 EState mState;
92 void setState(EState state); 93 void setState(EState state);
94
95 EState mState;
93 96
94 LLHost mLauncherHost; 97 LLHost mLauncherHost;
95 LLSocket::ptr_t mSocket; 98 LLSocket::ptr_t mSocket;