diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-06-30 17:13:51 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-06-30 17:13:51 -0700 |
| commit | eca87bb24f4703ad96f8fe800a4973402f015f32 (patch) | |
| tree | c8553a4c0d224cfb9baff80ffb3ec1bf97011ac4 /indra/newview/llmaterialmgr.cpp | |
| parent | ddb63e7fb70eefea200fbb385efe86e50e5c1e12 (diff) | |
| parent | 45ddc6e91da8e48a21fac1d317e66524db304a17 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llmaterialmgr.cpp')
| -rwxr-xr-x | indra/newview/llmaterialmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp index 8a726ec7c9..aef5bcf0dd 100755 --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -139,8 +139,8 @@ LLMaterialMgr::LLMaterialMgr(): LLAppCoreHttp & app_core_http(LLAppViewer::instance()->getAppCoreHttp()); mHttpRequest = LLCore::HttpRequest::ptr_t(new LLCore::HttpRequest()); - mHttpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders(), false); - mHttpOptions = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions(), false); + mHttpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders()); + mHttpOptions = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions()); mHttpPolicy = app_core_http.getPolicy(LLAppCoreHttp::AP_MATERIALS); mMaterials.insert(std::pair<LLMaterialID, LLMaterialPtr>(LLMaterialID::null, LLMaterialPtr(NULL))); |