diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 17:06:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 19:25:02 +0300 |
| commit | 0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch) | |
| tree | ccf664c765d1adbbf4985069321df65c85ca36e2 /indra/llcorehttp/_httpopcancel.cpp | |
| parent | bd8438f7083643ae5812b14e35e69e69ef1616c6 (diff) | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
Merge main into inventory_favorites
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/llcorehttp/_httpopcancel.cpp')
| -rw-r--r-- | indra/llcorehttp/_httpopcancel.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/llcorehttp/_httpopcancel.cpp b/indra/llcorehttp/_httpopcancel.cpp index c1912eb3db..3b6cd3caa9 100644 --- a/indra/llcorehttp/_httpopcancel.cpp +++ b/indra/llcorehttp/_httpopcancel.cpp @@ -43,8 +43,8 @@ namespace LLCore HttpOpCancel::HttpOpCancel(HttpHandle handle) - : HttpOperation(), - mHandle(handle) + : HttpOperation(), + mHandle(handle) {} @@ -59,15 +59,15 @@ HttpOpCancel::~HttpOpCancel() // its handler. void HttpOpCancel::stageFromRequest(HttpService * service) { - if (! service->cancel(mHandle)) - { - mStatus = HttpStatus(HttpStatus::LLCORE, HE_HANDLE_NOT_FOUND); - } - - addAsReply(); + if (! service->cancel(mHandle)) + { + mStatus = HttpStatus(HttpStatus::LLCORE, HE_HANDLE_NOT_FOUND); + } + + addAsReply(); } } // end namespace LLCore - + |