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

Merge branch 'FMODStudio'

Browse Source 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
This commit is contained in:
Shyotl
2015-01-26 17:15:46 -06:00
parent 2132978c41 6e4ef6f8a1
commit b865b92a6a
224 changed files with 4964 additions and 4731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llerror.cpp
View File

@@ -108,7 +108,7 @@ namespace {
mFile.close();
}
bool okay() { return mFile; }
bool okay() { return !!mFile; }
virtual bool wantsTime() { return true; }

2
indra/llcommon/lleventcoro.h
View File

@@ -67,7 +67,7 @@ public:
LLEventPumpOrPumpName() {}
operator LLEventPump& () const { return *mPump; }
LLEventPump& getPump() const { return *mPump; }
operator bool() const { return mPump; }
operator bool() const { return !!mPump; }
bool operator!() const { return ! mPump; }
private:

2
indra/llcommon/llstl.h
View File

@@ -296,7 +296,7 @@ inline void vector_shrink_to_fit(std::vector<T>& invec)
#if defined(LL_WINDOWS) || __cplusplus >= 201103L || (defined(__GXX_EXPERIMENTAL_CXX0X) && __GNUC_MINOR__ >= 5)
invec.shrink_to_fit();
#else
invec(invec.begin(), invec.end()).swap(invec);
std::vector<T>(invec).swap(invec);
#endif
}

37
indra/llcommon/llthread.h
View File

@@ -27,12 +27,16 @@
#ifndef LL_LLTHREAD_H
#define LL_LLTHREAD_H
#define USE_BOOST_MUTEX
#if !defined(_MSC_VER) || _MSC_VER >= 1700
#define USE_BOOST_MUTEX 1
#endif
#define IS_LLCOMMON_INLINE (!LL_COMMON_LINK_SHARED || defined(llcommon_EXPORTS))
#if LL_GNUC
// Needed for is_main_thread() when compiling with optimization (relwithdebinfo).
// It doesn't hurt to just always specify it though.
#pragma interface
//#pragma interface
#endif
#include "llapp.h"
@@ -188,7 +192,7 @@ protected:
//Prefer boost over stl over windows over apr.
#if defined(USE_BOOST_MUTEX) && (BOOST_VERSION >= 103400) //condition_variable_any was added in boost 1.34
#if USE_BOOST_MUTEX && (BOOST_VERSION >= 103400) //condition_variable_any was added in boost 1.34
//Define BOOST_SYSTEM_NO_DEPRECATED to avoid system_category() and generic_category() dependencies, as those won't be exported.
#define BOOST_SYSTEM_NO_DEPRECATED
#include <boost/thread/mutex.hpp>
@@ -268,7 +272,12 @@ public:
{
if (inc_lock_if_recursive())
return;
#if IS_LLCOMMON_INLINE
if (AIThreadID::in_main_thread_inline() && LLApp::isRunning())
#else
if (AIThreadID::in_main_thread() && LLApp::isRunning())
#endif
{
if (!LLMutexImpl::try_lock())
{
@@ -279,7 +288,11 @@ public:
{
LLMutexImpl::lock();
}
#if IS_LLCOMMON_INLINE
mLockingThread.reset_inline();
#else
mLockingThread.reset();
#endif
}
void unlock()
@@ -302,7 +315,11 @@ public:
return true;
if (!LLMutexImpl::try_lock())
return false;
#if IS_LLCOMMON_INLINE
mLockingThread.reset_inline();
#else
mLockingThread.reset();
#endif
return true;
}
@@ -321,7 +338,11 @@ public:
// Returns true if locked by this thread.
bool isSelfLocked() const
{
#if IS_LLCOMMON_INLINE
return mLockingThread.equals_current_thread_inline();
#else
return mLockingThread.equals_current_thread();
#endif
}
#ifdef NEEDS_MUTEX_IMPL
@@ -426,16 +447,20 @@ public:
{}
~LLCondition()
{}
void LL_COMMON_API wait()
void wait()
{
#if IS_LLCOMMON_INLINE
if (AIThreadID::in_main_thread_inline())
#else
if (AIThreadID::in_main_thread())
#endif
wait_main();
else LLConditionVariableImpl::wait(*this);
}
void signal() { LLConditionVariableImpl::notify_one(); }
void broadcast() { LLConditionVariableImpl::notify_all(); }
private:
void wait_main(); //Cannot be inline. Uses internal fasttimer.
LL_COMMON_API void wait_main(); //Cannot be inline. Uses internal fasttimer.
};
class LLMutexLock
@@ -646,7 +671,7 @@ public:
void unref()
{
llassert(mRef > 0);
if (!--mRef) delete this;
if (--mRef == 0) delete this;
}
S32 getNumRefs() const
{