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

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.

indra/llvfs/llpidlock.cpp

@@ -60,8 +60,12 @@ class LLPidLockFile
 {
 	public:
 		LLPidLockFile( ) :
-			mSaving(FALSE), mWaiting(FALSE), 
-			mClean(TRUE), mPID(LLApp::getPid())
+			mAutosave(false),
+			mSaving(false),
+			mWaiting(false),
+			mPID(LLApp::getPid()),
+			mNameTable(NULL),
+			mClean(true)
 		{
 			mLockName = gDirUtilp->getTempDir() + "/savelock";
 		}

indra/llvfs/llvfile.h

@@ -80,16 +80,14 @@ public:
 	static const S32 READ_WRITE;
 	static const S32 APPEND;
 	
+protected:
 	LLAssetType::EType mFileType;
 
 	LLUUID	mFileID;
-
-protected:
 	S32		mPosition;
 	S32		mMode;
 	LLVFS	*mVFS;
 	F32		mPriority;
-	BOOL	mOnReadQueue;
 
 	S32		mBytesRead;
 	LLVFSThread::handle_t mHandle;