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/_refcounted.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/_refcounted.cpp')
| -rw-r--r-- | indra/llcorehttp/_refcounted.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcorehttp/_refcounted.cpp b/indra/llcorehttp/_refcounted.cpp index e7d0b72741..94b28102f3 100644 --- a/indra/llcorehttp/_refcounted.cpp +++ b/indra/llcorehttp/_refcounted.cpp @@ -1,4 +1,4 @@ -/** +/** * @file _refcounted.cpp * @brief Atomic, thread-safe ref counting and destruction mixin class * @@ -30,11 +30,11 @@ namespace LLCoreInt { -#if ! LL_WINDOWS +#if ! LL_WINDOWS const S32 RefCounted::NOT_REF_COUNTED; -#endif // ! LL_WINDOWS +#endif // ! LL_WINDOWS RefCounted::~RefCounted() {} |