diff options
author | Rider Linden <rider@lindenlab.com> | 2015-07-01 08:47:50 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-07-01 08:47:50 -0700 |
commit | 9f2302bdffde0c82a0cfab730a250aaee9b7059c (patch) | |
tree | 942b1e99701fa70993515d706bdedc836157ef30 /indra/newview/llassetuploadqueue.cpp | |
parent | f25179f148415763e310b0dd7f91a37dcf4c58c0 (diff) | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) |
Merge
Diffstat (limited to 'indra/newview/llassetuploadqueue.cpp')
-rwxr-xr-x | indra/newview/llassetuploadqueue.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadqueue.cpp b/indra/newview/llassetuploadqueue.cpp index 8833c57948..359ee1e221 100755 --- a/indra/newview/llassetuploadqueue.cpp +++ b/indra/newview/llassetuploadqueue.cpp @@ -168,6 +168,7 @@ void LLAssetUploadQueue::request(LLAssetUploadQueueSupplier** supplier) body["item_id"] = data.mItemId; body["is_script_running"] = data.mIsRunning; body["target"] = data.mIsTargetMono? "mono" : "lsl2"; + body["experience"] = data.mExperienceId; std::string url = ""; LLViewerObject* object = gObjectList.findObject(data.mTaskId); @@ -191,7 +192,8 @@ void LLAssetUploadQueue::queue(const std::string& filename, const LLUUID& queue_id, U8* script_data, U32 data_size, - std::string script_name) + std::string script_name, + const LLUUID& experience_id) { UploadData data; data.mTaskId = task_id; @@ -203,6 +205,7 @@ void LLAssetUploadQueue::queue(const std::string& filename, data.mData = script_data; data.mDataSize = data_size; data.mScriptName = script_name; + data.mExperienceId = experience_id; mQueue.push_back(data); |