5f72cbb103
Actually flush messages before terminating a plugin (upon the shutdown message) and flush messages in the file- and dirpicker before opening the blocking dialog. Flush debug messages too (deeper into the code, just prior to the actual blocking call). Also, fix the context folder map to be a thread-safe singleton and *attempt* to add support for default folders to windows and Mac. The latter might even not compile yet and definitely have to be tested (and fixed): Opening a DirPicker in preferences --> Network and Set the directory location of the cache. It should open a Dialog window where you are already in the folder that is the current cache directory setting (you can click Cancel after verifying that this worked). And, start to upload an image, select a file is some directory (other than what it starts in). You can omit the actual upload by clicking cancel in the preview. Then upload again and now it should start in the same folder as that you were just in. Possibly you need to first open a file picker elsewhere with a different context though, or windows might choose to open in the last folder anyway while the code doesn't really work. Uploading a sound before the second texture upload should do the trick.
105 lines
3.2 KiB
C++
105 lines
3.2 KiB
C++
/**
|
|
* @file llpluginmessagepipe.h
|
|
* @brief Classes that implement connections from the plugin system to pipes/pumps.
|
|
*
|
|
* @cond
|
|
* $LicenseInfo:firstyear=2008&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2008-2010, Linden Research, Inc.
|
|
*
|
|
* Second Life Viewer Source Code
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlife.com/developers/opensource/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlife.com/developers/opensource/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*
|
|
* @endcond
|
|
*/
|
|
|
|
#ifndef LL_LLPLUGINMESSAGEPIPE_H
|
|
#define LL_LLPLUGINMESSAGEPIPE_H
|
|
|
|
#include "lliosocket.h"
|
|
#include "llthread.h"
|
|
|
|
class LLPluginMessagePipe;
|
|
|
|
// Inherit from this to be able to receive messages from the LLPluginMessagePipe
|
|
class LLPluginMessagePipeOwner
|
|
{
|
|
LOG_CLASS(LLPluginMessagePipeOwner);
|
|
public:
|
|
LLPluginMessagePipeOwner();
|
|
virtual ~LLPluginMessagePipeOwner();
|
|
// called with incoming messages
|
|
virtual void receiveMessageRaw(const std::string &message) = 0;
|
|
// called when the socket has an error
|
|
virtual apr_status_t socketError(apr_status_t error);
|
|
|
|
// called from LLPluginMessagePipe to manage the connection with LLPluginMessagePipeOwner -- do not use!
|
|
virtual void setMessagePipe(LLPluginMessagePipe *message_pipe);
|
|
|
|
protected:
|
|
// returns false if writeMessageRaw() would drop the message
|
|
bool canSendMessage(void);
|
|
// call this to send a message over the pipe
|
|
bool writeMessageRaw(const std::string &message);
|
|
// call this to attempt to flush all messages for 10 seconds long.
|
|
bool flushMessages(void);
|
|
// call this to close the pipe
|
|
void killMessagePipe(void);
|
|
|
|
LLPluginMessagePipe *mMessagePipe;
|
|
apr_status_t mSocketError;
|
|
};
|
|
|
|
class LLPluginMessagePipe
|
|
{
|
|
LOG_CLASS(LLPluginMessagePipe);
|
|
public:
|
|
LLPluginMessagePipe(LLPluginMessagePipeOwner *owner, LLSocket::ptr_t socket);
|
|
virtual ~LLPluginMessagePipe();
|
|
|
|
bool addMessage(const std::string &message);
|
|
void clearOwner(void);
|
|
|
|
bool pump(F64 timeout = 0.0f);
|
|
bool pumpOutput(bool flush = false);
|
|
bool pumpInput(F64 timeout = 0.0f);
|
|
|
|
bool flushMessages(void) { return pumpOutput(true); }
|
|
|
|
protected:
|
|
void processInput(void);
|
|
|
|
// used internally by pump()
|
|
void setSocketTimeout(apr_interval_time_t timeout_usec);
|
|
|
|
LLMutex mInputMutex;
|
|
std::string mInput;
|
|
LLMutex mOutputMutex;
|
|
std::string mOutput;
|
|
|
|
LLPluginMessagePipeOwner *mOwner;
|
|
LLSocket::ptr_t mSocket;
|
|
};
|
|
|
|
#endif // LL_LLPLUGINMESSAGE_H
|