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/newview/llviewermedia.cpp
	indra/plugins/base_media/CMakeLists.txt

Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.
This commit is contained in:
Aleric Inglewood
2011-05-10 04:46:58 +02:00
parent e0b0fa4f58 8227efcaf1
commit 133391be90
54 changed files with 427 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/aithreadsafe.h
View File

@@ -308,7 +308,7 @@ protected:
//! Constructor used by AIWriteAccess.
AIReadAccess(AIThreadSafe<T>& wrapper, state_type state) : AIReadAccessConst<T>(wrapper, state) { }
friend class AIWriteAccess<T>;
friend struct AIWriteAccess<T>;
};
/**