diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-20 14:56:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-20 14:56:10 -0400 |
| commit | 6f5313caea9bb8458dca23bbaf4f10cd6641c7fb (patch) | |
| tree | ac34191250860e5f250cf1cc2e9199cdaa8204f6 /indra/newview/llmeshrepository.h | |
| parent | eb8221338e0276b9afe8d92738166f97782d48d6 (diff) | |
| parent | 0b612741d53a044a0179e1c32018bf8cd4213631 (diff) | |
automated merge mesh-development -> davep-mesh-candidate-2010
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 5983a282a2..f859e29c07 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -387,6 +387,8 @@ public: LLHost mHost; std::string mUploadObjectAssetCapability; std::string mNewInventoryCapability; + std::string mWholeModelFeeCapability; + std::string mWholeModelUploadURL; std::queue<LLMeshUploadData> mUploadQ; std::queue<LLMeshUploadData> mConfirmedQ; @@ -420,6 +422,16 @@ public: void preStart(); void discard() ; BOOL isDiscarded(); + + void doWholeModelUpload(); + void doIterativeUpload(); + + void wholeModelToLLSD(LLSD& dest, bool include_textures); + + void decomposeMeshMatrix(LLMatrix4& transformation, + LLVector3& result_pos, + LLQuaternion& result_rot, + LLVector3& result_scale); }; class LLMeshRepository |