diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-11-02 17:28:10 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-11-03 09:50:03 -0700 |
| commit | dfb44aec706532cd26a1fcc6415cc7fdadec9907 (patch) | |
| tree | 1a97d1220a1ddb0405ee351d61f35edee9458c0d | |
| parent | 826310bcab9df0ae79d805ca1f4d1842cbeb2ed2 (diff) | |
Fix build error from overly fancy tracy macro usage that nobody else is using for DRTVWR-559
| -rw-r--r-- | indra/llcommon/llprofiler.h | 1 | ||||
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index 736a069f49..af5e5777bf 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -114,6 +114,7 @@ extern thread_local bool gProfilerEnabled; #define LL_PROFILER_SET_THREAD_NAME( name ) (void)(name) #define LL_RECORD_BLOCK_TIME(name) const LLTrace::BlockTimer& LL_GLUE_TOKENS(block_time_recorder, __LINE__)(LLTrace::timeThisBlock(name)); (void)LL_GLUE_TOKENS(block_time_recorder, __LINE__); #define LL_PROFILE_ZONE_NAMED(name) // LL_PROFILE_ZONE_NAMED is a no-op when Tracy is disabled + #define LL_PROFILE_ZONE_NAMED_COLOR(name,color) // LL_PROFILE_ZONE_NAMED_COLOR is a no-op when Tracy is disabled #define LL_PROFILE_ZONE_SCOPED // LL_PROFILE_ZONE_SCOPED is a no-op when Tracy is disabled #define LL_PROFILE_ZONE_COLOR(name,color) // LL_RECORD_BLOCK_TIME(name) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 4137bfa788..74a5442586 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -3323,7 +3323,7 @@ bool LLInventoryModel::loadFromFile(const std::string& filename, LLInventoryModel::changed_items_t& cats_to_update, bool &is_cache_obsolete) { - LL_PROFILE_ZONE_NAMED_COLOR("inventory load from file", 0xFF1111); + LL_PROFILE_ZONE_NAMED("inventory load from file"); if(filename.empty()) { |