diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-05-06 16:40:12 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-06 16:40:12 -0700 |
| commit | 4af9128db1fb65ff99d1e8086352698f46e049b4 (patch) | |
| tree | 4b98d8afb138a4a1ac9f2d4b01a7d83dce314d17 /indra/llcorehttp/_httpoperation.cpp | |
| parent | 05b2dd913fcb1c5485ce19885e4e60f26752e6b0 (diff) | |
| parent | 10aa7f4254fd04c24f15f507188705146f92ee60 (diff) | |
Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'indra/llcorehttp/_httpoperation.cpp')
| -rw-r--r-- | indra/llcorehttp/_httpoperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httpoperation.cpp b/indra/llcorehttp/_httpoperation.cpp index 3b64018132..c3a9bcaf54 100644 --- a/indra/llcorehttp/_httpoperation.cpp +++ b/indra/llcorehttp/_httpoperation.cpp @@ -58,7 +58,7 @@ HttpOperation::handleMap_t HttpOperation::mHandleMap; LLCoreInt::HttpMutex HttpOperation::mOpMutex; HttpOperation::HttpOperation(): - boost::enable_shared_from_this<HttpOperation>(), + std::enable_shared_from_this<HttpOperation>(), mReplyQueue(), mUserHandler(), mReqPolicy(HttpRequest::DEFAULT_POLICY_ID), |