Initial work.

indra/newview/llmeshrepository.h

@@ -33,37 +33,10 @@
 #include "llviewertexture.h"
 #include "llvolume.h"
 
-#if MESH_IMPORT
 #define LLCONVEXDECOMPINTER_STATIC 1
 
 #include "llconvexdecomposition.h"
-#endif //MESH_IMPORT
-
-#if !MESH_IMPORT
-//Placeholder structs from LLConvexDecomposition.h:
-struct LLCDMeshData
-{
-        enum IndexType 
-        {
-                INT_16,
-                INT_32
-        };
-
-        const float*    mVertexBase;
-        int                             mVertexStrideBytes;
-        int                             mNumVertices;
-        const void*             mIndexBase;
-        IndexType               mIndexType;
-        int                             mIndexStrideBytes;
-        int                             mNumTriangles;
-};
-struct LLCDHull
-{
-        const float*    mVertexBase;
-        int                             mVertexStrideBytes;
-        int                             mNumVertices;
-};
-#endif //!MESH_IMPORT
+#include "lluploadfloaterobservers.h"
 
 class LLVOVolume;
 class LLMeshResponder;
@@ -245,8 +218,8 @@ public:
 	static S32 sActiveLODRequests;
 	static U32 sMaxConcurrentRequests;
 
-	LLMutex*		mMutex;
-	LLMutex*		mHeaderMutex;
+	LLMutex*	mMutex;
+	LLMutex*	mHeaderMutex;
 	LLCondition*	mSignal;
 
 	//map of known mesh headers
@@ -377,7 +350,6 @@ public:
 
 };
 
-#if MESH_IMPORT
 class LLMeshUploadThread : public LLThread 
 {
 private:
@@ -427,6 +399,9 @@ public:
 					   LLHandle<LLWholeModelFeeObserver> fee_observer= (LLHandle<LLWholeModelFeeObserver>()), LLHandle<LLWholeModelUploadObserver> upload_observer = (LLHandle<LLWholeModelUploadObserver>()));
 	~LLMeshUploadThread();
 
+	void startRequest() { ++mPendingUploads; }
+	void stopRequest() { --mPendingUploads; }
+
 	virtual void run();
 	void preStart();
 	void discard() ;
@@ -453,7 +428,6 @@ private:
 
 	bool mDoUpload; // if FALSE only model data will be requested, otherwise the model will be uploaded
 };
-#endif //MESH_IMPORT
 
 class LLMeshRepository
 {
@@ -502,11 +476,9 @@ public:
 
 	LLSD& getMeshHeader(const LLUUID& mesh_id);
 
-#if MESH_IMPORT
 	void uploadModel(std::vector<LLModelInstance>& data, LLVector3& scale, bool upload_textures,
 			bool upload_skin, bool upload_joints, std::string upload_url, bool do_upload = true,
 					 LLHandle<LLWholeModelFeeObserver> fee_observer= (LLHandle<LLWholeModelFeeObserver>()), LLHandle<LLWholeModelUploadObserver> upload_observer = (LLHandle<LLWholeModelUploadObserver>()));
-#endif //MESH_IMPORT
 
 	S32 getMeshSize(const LLUUID& mesh_id, S32 lod);
 
@@ -544,15 +516,11 @@ public:
 	
 	U32 mMeshThreadCount;
 
-#if MESH_IMPORT
 	void cacheOutgoingMesh(LLMeshUploadData& data, LLSD& header);
-#endif //MESH_IMPORT
 
 	LLMeshRepoThread* mThread;
-#if MESH_IMPORT
 	std::vector<LLMeshUploadThread*> mUploads;
 	std::vector<LLMeshUploadThread*> mUploadWaitList;
-#endif //MESH_IMPORT
 
 	LLPhysicsDecomp* mDecompThread;