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

Merge branch 'master' of https://github.com/siana/SingularityViewer

Browse Source 
Resolved Conflicts:
	indra/llcommon/aithreadsafe.h

Manually added patch had trailing space more.
This commit is contained in:
Aleric Inglewood
2011-05-22 22:42:24 +02:00
parent 820337f75b 1327c80dd7
commit 8ee4ed96b7
9 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llcommon/llsdserialize.cpp
View File

@@ -1447,9 +1447,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
}
case LLSD::TypeUUID:
{
ostr.put('u');
ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES);
LLUUID d = data.asUUID();
ostr.write((const char*)(&(d.mData)), UUID_BYTES);
break;
}
case LLSD::TypeString:
ostr.put('s');

4
indra/llcommon/llthread.h
View File

@@ -179,6 +179,10 @@ public:
protected:
AIAPRPool mPool;
private:
// Disable copy construction, as si teh bomb!!! -SG
LLMutex(const LLMutex&);
LLMutex& operator=(const LLMutex&);
};
#if APR_HAS_THREADS

2
indra/llcommon/llversionviewer.h
View File

@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 8;
const S32 LL_VERSION_BUILD = 0;
const S32 LL_VERSION_BUILD = 1;
const char * const LL_CHANNEL = "Singularity";