diff options
| author | callum_linden <none@none> | 2015-06-30 11:51:58 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-06-30 11:51:58 -0700 |
| commit | 8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (patch) | |
| tree | e24f1b1735f17968410704e56d0e043fb143aafe /indra/newview/llassetuploadqueue.h | |
| parent | f7908a50294adff3456436074075a677a9c6239b (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
Merge with head of viewer-release
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 |