Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llstartup.cpp

1 files changed, 51 insertions, 0 deletions

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 3411e9c6bb..fc08ec8c8f 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -133,6 +133,7 @@ namespace {
         RecordToFile(const std::string& filename):
             mName(filename)
         {
+            showMultiline(true);
             mFile.open(filename.c_str(), std::ios_base::out | std::ios_base::app);
             if (!mFile)
             {
@@ -344,6 +345,51 @@ namespace {
         }
     };
 #endif
+
+#if LL_PROFILER_CONFIGURATION >= LL_PROFILER_CONFIG_TRACY
+    class RecordToTracy : public LLError::Recorder
+    {
+    public:
+        RecordToTracy()
+        {
+            this->showMultiline(true);
+            this->showTags(false);
+            this->showLocation(false);
+        }
+
+        virtual bool enabled() override { return LLError::getEnabledLogTypesMask() & 0x12; }
+
+        virtual void recordMessage(LLError::ELevel level, const std::string& message) override
+        {
+            LL_PROFILE_ZONE_SCOPED_CATEGORY_LOGGING;
+            switch (level)
+            {
+                case LLError::LEVEL_DEBUG:
+                {
+                    TracyMessageC(message.c_str(), message.size(), tracy::Color::Turquoise);
+                    break;
+                }
+                default:
+                case LLError::LEVEL_NONE:
+                case LLError::LEVEL_INFO:
+                {
+                    TracyMessageC(message.c_str(), message.size(), tracy::Color::White);
+                    break;
+                }
+                case LLError::LEVEL_WARN:
+                {
+                    TracyMessageC(message.c_str(), message.size(), tracy::Color::Yellow);
+                    break;
+                }
+                case LLError::LEVEL_ERROR:
+                {
+                    TracyMessageC(message.c_str(), message.size(), tracy::Color::Red);
+                    break;
+                }
+            }
+        }
+    };
+#endif
 }
 
 
@@ -759,6 +805,11 @@ namespace
         LLError::addRecorder(recordToWinDebug);
 #endif
 
+#if LL_PROFILER_CONFIGURATION >= LL_PROFILER_CONFIG_TRACY
+        LLError::RecorderPtr recordToTracy(new RecordToTracy());
+        LLError::addRecorder(recordToTracy);
+#endif
+
         LogControlFile& e = LogControlFile::fromDirectory(user_dir, app_dir);
 
         // NOTE: We want to explicitly load the file before we add it to the event timer