diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-24 09:33:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-24 09:33:58 +0300 |
commit | f32d3767dc6f0d4d831882135d2eb88ee96ba79d (patch) | |
tree | 21685bf5688d93ee583d6f7059fdf5ccb7cea5f2 /indra/newview/llspatialpartition.cpp | |
parent | 25e9c61eef179c7ad79d19261f72c1bc85a3ff1b (diff) | |
parent | 57e78ed43b61864a6b8a54df95d8823daaeb5fe8 (diff) |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r-- | indra/newview/llspatialpartition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2ff9ef1544..ffe5fa394f 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -498,7 +498,7 @@ public: void LLSpatialGroup::setState(U32 state, S32 mode) { - LL_PROFILE_ZONE_SCOPED_CATEGORY_SPATIAL + LL_PROFILE_ZONE_SCOPED_CATEGORY_SPATIAL; llassert(state <= LLSpatialGroup::STATE_MASK); @@ -547,7 +547,7 @@ public: void LLSpatialGroup::clearState(U32 state, S32 mode) { - LL_PROFILE_ZONE_SCOPED_CATEGORY_SPATIAL + LL_PROFILE_ZONE_SCOPED_CATEGORY_SPATIAL; llassert(state <= LLSpatialGroup::STATE_MASK); |