diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-01-07 19:24:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-07 19:24:11 +0200 |
| commit | 1cf375c89adfae557b18dadfb267659b6fb0a8ce (patch) | |
| tree | 77c9f59277aad29cf00dd2de00d97c1909f9f59e /indra/llxml/llcontrol.h | |
| parent | 516bd5e832a91e1f837b5b1b621cfac5fe71c08f (diff) | |
| parent | cab31f8bfed507425a09b266d47823f6acddfa94 (diff) | |
Merge pull request #5227 from RyeMutt/rye/devmerge
Sync develop-linux with develop
Diffstat (limited to 'indra/llxml/llcontrol.h')
| -rw-r--r-- | indra/llxml/llcontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index da7268bf45..c9bd0a8a32 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -278,7 +278,7 @@ public: // as the given type. U32 loadFromFileLegacy(const std::string& filename, bool require_declaration = true, eControlType declare_as = TYPE_STRING); U32 saveToFile(const std::string& filename, bool nondefault_only); - U32 loadFromFile(const std::string& filename, bool default_values = false, bool save_values = true); + U32 loadFromFile(const std::string& filename, bool default_values = false, bool save_values = true, bool error_when_no_comment = true); void resetToDefaults(); void incrCount(std::string_view name); |