diff options
| author | Howard Stearns <howard.stearns@gmail.com> | 2022-08-30 10:20:15 -0700 |
|---|---|---|
| committer | Howard Stearns <howard.stearns@gmail.com> | 2022-08-30 10:20:15 -0700 |
| commit | 3b70c9d49c2a963439b3811e80d24576f390552b (patch) | |
| tree | 11461161da7c92d76a36d921247158230e4052f2 /indra/newview/llmaterialmgr.cpp | |
| parent | 6fbc733c9779454f2f1ebade494323e315917851 (diff) | |
| parent | 197ac7cc2048fe4c259858f48946cd954782dfc2 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade
Diffstat (limited to 'indra/newview/llmaterialmgr.cpp')
| -rw-r--r-- | indra/newview/llmaterialmgr.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp index 11aa607393..27a9758ec3 100644 --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -133,8 +133,7 @@ LLMaterialMgr::LLMaterialMgr(): mHttpRequest(), mHttpHeaders(), mHttpOptions(), - mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID), - mHttpPriority(0) + mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID) { LLAppCoreHttp & app_core_http(LLAppViewer::instance()->getAppCoreHttp()); @@ -699,7 +698,7 @@ void LLMaterialMgr::processGetQueue() << "\ndata: " << ll_pretty_print_sd(materialsData) << LL_ENDL; LLCore::HttpHandle handle = LLCoreHttpUtil::requestPostWithLLSD(mHttpRequest, - mHttpPolicy, mHttpPriority, capURL, + mHttpPolicy, capURL, postData, mHttpOptions, mHttpHeaders, handler); if (handle == LLCORE_HTTP_HANDLE_INVALID) @@ -985,7 +984,7 @@ void LLMaterialMgr::processPutQueue() )); LLCore::HttpHandle handle = LLCoreHttpUtil::requestPutWithLLSD( - mHttpRequest, mHttpPolicy, mHttpPriority, capURL, + mHttpRequest, mHttpPolicy, capURL, putData, mHttpOptions, mHttpHeaders, handler); if (handle == LLCORE_HTTP_HANDLE_INVALID) |