diff options
| author | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
| commit | 71406f1af805d0b88e348b81a67bcde3d0b3d885 (patch) | |
| tree | 9eab3e24208d2aecedf29eed0eebb6f209197475 /indra/newview/llassetuploadqueue.h | |
| parent | d89b4109f9ac3f1ef95480823df292bbc8200347 (diff) | |
| parent | 8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (diff) | |
Merge with head
Diffstat (limited to 'indra/newview/llassetuploadqueue.h')
| -rwxr-xr-x | indra/newview/llassetuploadqueue.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadqueue.h b/indra/newview/llassetuploadqueue.h index 434f3e5c03..2ceee8f700 100755 --- a/indra/newview/llassetuploadqueue.h +++ b/indra/newview/llassetuploadqueue.h @@ -50,7 +50,8 @@ public: const LLUUID& queue_id, U8* data, U32 data_size, - std::string script_name); + std::string script_name, + const LLUUID& experience_id); bool isEmpty() const {return mQueue.empty();} @@ -69,6 +70,7 @@ private: U8* mData; U32 mDataSize; std::string mScriptName; + LLUUID mExperienceId; }; // Ownership of mSupplier passed to currently waiting responder |