diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
| commit | f7d94905db3f39785863b91f75daf612dc6c3c48 (patch) | |
| tree | ca958ce0a621c0ed8012336fbdb03867409c1f17 /indra/newview/llassetuploadqueue.h | |
| parent | fa1913ea679fd895d709da5c5782b26c7d03a40a (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
merge changes for 3.8.0-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 |