diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-06-30 16:46:45 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-06-30 16:46:45 -0400 |
commit | 491f30e43e571fca9939930a5e8d10caa5f65ad2 (patch) | |
tree | cd5ccb95b4b32374545a0bda36a49bebd9e5b2a0 /indra/newview/llassetuploadqueue.h | |
parent | 6c6b509aa3d4ca1e4620a80f0b6235393af2a33a (diff) | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) |
merge
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 |