diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 15:35:52 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 15:35:52 -0700 |
| commit | c24a5a3fb5e24ffe3faddb5c71e884d9a1513db0 (patch) | |
| tree | f86db3b8b82c734a60dc15cb3d0e79f990803adb /indra/newview/llmeshrepository.h | |
| parent | 73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (diff) | |
| parent | 325c2b216907b84b02b425103b011a556222b474 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index ba64387dbb..d5b06cc66f 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -393,8 +393,6 @@ public: BOOL mDiscarded ; LLHost mHost; - std::string mUploadObjectAssetCapability; - std::string mNewInventoryCapability; std::string mWholeModelFeeCapability; std::string mWholeModelUploadURL; @@ -413,12 +411,10 @@ public: void uploadTexture(LLTextureUploadData& data); void doUploadTexture(LLTextureUploadData& data); - void sendCostRequest(LLTextureUploadData& data); void priceResult(LLTextureUploadData& data, const LLSD& content); void onTextureUploaded(LLTextureUploadData& data); void uploadModel(LLMeshUploadData& data); - void sendCostRequest(LLMeshUploadData& data); void doUploadModel(LLMeshUploadData& data); void onModelUploaded(LLMeshUploadData& data); void createObjects(LLMeshUploadData& data); @@ -432,7 +428,6 @@ public: BOOL isDiscarded(); void doWholeModelUpload(); - void doIterativeUpload(); void wholeModelToLLSD(LLSD& dest, bool include_textures); |