From c61dcb9001b0218f1a1bfa1bf60b2c7ea7470b32 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 4 Jul 2020 10:21:09 -0400
Subject: [PATCH] Only prevent recursive settings file inclusion during initial
load
---
indra/llxml/llcontrol.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index e71fc498120..a8d6425a89f 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -1058,7 +1058,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only
U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values, bool save_values)
{
- if (!mIncludedFiles.insert(filename).second)
+ if (!mIncludedFiles.insert(filename).second && set_default_values)
{
return 0; //Already included this file.
}
--
GitLab