Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2013-02-03 22:18:44 +01:00
parent 2b036c7334 83fb898852
commit 064601ae5e
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llappearance/llavatarjoint.cpp
View File

@@ -27,6 +27,7 @@
//-----------------------------------------------------------------------------
// Header Files
//-----------------------------------------------------------------------------
#include "linden_common.h"
#include "llavatarjoint.h"
#include "llgl.h"

1
indra/llappearance/llpolymorph.cpp
View File

@@ -28,6 +28,7 @@
// Header Files
//-----------------------------------------------------------------------------
#include "linden_common.h"
#include "llpolymorph.h"
#include "llavatarappearance.h"
#include "llavatarjoint.h"

3
indra/llappearance/llpolyskeletaldistortion.cpp
View File

@@ -27,8 +27,7 @@
//-----------------------------------------------------------------------------
// Header Files
//-----------------------------------------------------------------------------
#include "llpreprocessor.h"
#include "llerrorlegacy.h"
#include "linden_common.h"
//#include "llcommon.h"
//#include "llmemory.h"
#include "llavatarappearance.h"

13
indra/llmessage/aicurlthread.cpp
View File

@@ -841,10 +841,7 @@ class AICurlThread : public LLThread
virtual ~AICurlThread();
// MAIN-THREAD
void wakeup_thread(void);
// MAIN-THREAD
void stop_thread(void) { mRunning = false; wakeup_thread(); }
void wakeup_thread(bool stop_thread = false);
// MAIN-THREAD
apr_status_t join_thread(void);
@@ -1071,7 +1068,7 @@ void AICurlThread::cleanup_wakeup_fds(void)
}
// MAIN-THREAD
void AICurlThread::wakeup_thread(void)
void AICurlThread::wakeup_thread(bool stop_thread)
{
DoutEntering(dc::curl, "AICurlThread::wakeup_thread");
llassert(is_main_thread());
@@ -1080,6 +1077,10 @@ void AICurlThread::wakeup_thread(void)
if (!mRunning)
return;
// Last time we are run?
if (stop_thread)
mRunning = false;
// Try if curl thread is still awake and if so, pass the new commands directly.
if (mWakeUpMutex.tryLock())
{
@@ -1857,7 +1858,7 @@ void stopCurlThread(void)
using curlthread::AICurlThread;
if (AICurlThread::sInstance)
{
AICurlThread::sInstance->stop_thread();
AICurlThread::sInstance->wakeup_thread(true);
int count = 401;
while(--count && !AICurlThread::sInstance->isStopped())
{