diff options
| author | McCabe Maxsted | 2011-02-18 19:44:16 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-02-18 19:44:16 -0700 |
| commit | f6c52845fa2509f420e599b4c2033dfa1571f1ed (patch) | |
| tree | 281bf361a3fdd22665c571b3eee417d340c77c9f /linden/indra/llplugin/llpluginmessagepipe.cpp | |
| parent | Created a media_plugin_gstreamer010.log file in the cwd for the GStreamer plugin (diff) | |
| parent | Fixed Windows compile error introduced in fe9a3d2b. Also made sure winsock2.h... (diff) | |
| download | meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.zip meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.tar.gz meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.tar.bz2 meta-impy-f6c52845fa2509f420e599b4c2033dfa1571f1ed.tar.xz | |
Merge remote branch 'remotes/github/weekly' into weekly
Diffstat (limited to 'linden/indra/llplugin/llpluginmessagepipe.cpp')
| -rwxr-xr-x | linden/indra/llplugin/llpluginmessagepipe.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp index 26cc9c0..ac3a902 100755 --- a/linden/indra/llplugin/llpluginmessagepipe.cpp +++ b/linden/indra/llplugin/llpluginmessagepipe.cpp | |||
| @@ -99,8 +99,6 @@ void LLPluginMessagePipeOwner::killMessagePipe(void) | |||
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | LLPluginMessagePipe::LLPluginMessagePipe(LLPluginMessagePipeOwner *owner, LLSocket::ptr_t socket): | 101 | LLPluginMessagePipe::LLPluginMessagePipe(LLPluginMessagePipeOwner *owner, LLSocket::ptr_t socket): |
| 102 | mInputMutex(gAPRPoolp), | ||
| 103 | mOutputMutex(gAPRPoolp), | ||
| 104 | mOwner(owner), | 102 | mOwner(owner), |
| 105 | mSocket(socket) | 103 | mSocket(socket) |
| 106 | { | 104 | { |