From f9e049c9e5cc01b464e66cab3e34e33864946c0c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 15 May 2017 15:09:57 -0400
Subject: [PATCH] add some extra logging to feature table parsing
---
indra/newview/llfeaturemanager.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index d4ba230feb2..b8fd96840b0 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -324,18 +324,19 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
// Check file version
file >> name;
- file >> version;
if (name != "version")
{
LL_WARNS("RenderInit") << filename << " does not appear to be a valid feature table!" << LL_ENDL;
return false;
}
+ file >> version;
mTableVersion = version;
+ LL_INFOS("RenderInit") << "Found feature table version " << version << LL_ENDL;
LLFeatureList *flp = NULL;
bool parse_ok = true;
- while (file >> name && parse_ok)
+ while (parse_ok && file >> name )
{
char buffer[MAX_STRING]; /*Flawfinder: ignore*/
@@ -345,7 +346,7 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
file.getline(buffer, MAX_STRING);
continue;
}
-
+
if (name == "list")
{
LL_DEBUGS("RenderInit") << "Before new list" << std::endl;
@@ -368,7 +369,7 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
}
else
{
- LL_WARNS("RenderInit") << "Overriding mask " << name << ", this is invalid!" << LL_ENDL;
+ LL_WARNS("RenderInit") << "Overriding mask '" << name << "'; this is invalid!" << LL_ENDL;
parse_ok = false;
}
}
--
GitLab