diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
| commit | 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 (patch) | |
| tree | 19f051897838d5a75e5ce1e776bb52a330173171 /indra/llmessage/llassetstorage.h | |
| parent | fc664e93e62645fc6e9659664351e77f3c4b374f (diff) | |
merge release@56803 release-candidate@56833
Diffstat (limited to 'indra/llmessage/llassetstorage.h')
| -rw-r--r-- | indra/llmessage/llassetstorage.h | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h index 4ccbb08abd..59baddd69c 100644 --- a/indra/llmessage/llassetstorage.h +++ b/indra/llmessage/llassetstorage.h @@ -68,6 +68,10 @@ public: LLUUID getUUID() const { return mUUID; } LLAssetType::EType getType() const { return mType; } + + void setUUID(const LLUUID& id) { mUUID = id; } + void setType(LLAssetType::EType type) { mType = type; } + protected: LLUUID mUUID; LLAssetType::EType mType; @@ -97,6 +101,10 @@ public: LLUUID getUUID() const { return mUUID; } LLAssetType::EType getType() const { return mType; } + + void setUUID(const LLUUID& id) { mUUID = id; } + void setType(LLAssetType::EType type) { mType = type; } + protected: LLUUID mUUID; LLAssetType::EType mType; @@ -122,6 +130,10 @@ public: LLUUID getUUID() const { return mUUID; } LLAssetType::EType getAType() const { return mAType; } + + void setUUID(const LLUUID& id) { mUUID = id; } + void setType(LLAssetType::EType type) { mAType = type; } + protected: LLUUID mUUID; LLAssetType::EType mAType; @@ -237,9 +249,21 @@ public: LLSD getPendingUploadTypes() const; // download process callbacks - static void downloadCompleteCallback(const S32 result, void *user_data); - static void downloadEstateAssetCompleteCallback(const S32 result, void *user_data); - static void downloadInvItemCompleteCallback(const S32 result, void *user_data); + static void downloadCompleteCallback( + S32 result, + const LLUUID& file_id, + LLAssetType::EType file_type, + void* user_data); + static void downloadEstateAssetCompleteCallback( + S32 result, + const LLUUID& file_id, + LLAssetType::EType file_type, + void* user_data); + static void downloadInvItemCompleteCallback( + S32 result, + const LLUUID& file_id, + LLAssetType::EType file_type, + void* user_data); // upload process callbacks static void uploadCompleteCallback(const LLUUID&, void *user_data, S32 result); |