diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-07-01 14:40:05 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-07-01 14:40:05 +0300 |
| commit | 79ffc6569b8b0f4656c61f86b18e3bde22eb6dd5 (patch) | |
| tree | aa47a0b1f3f086ae884990107014ede35745fdd8 /indra/newview/llassetuploadqueue.h | |
| parent | 51aaed86dee3b45fa96fc7b4e8c1b9486c880b3b (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
Merge from viewer-relese and become version 3.8.1
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 |