diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-05-13 18:26:53 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-05-13 21:25:58 +0300 |
| commit | 2008f87f10d51a2f9372aa4a4d72e86ac94e1e81 (patch) | |
| tree | 2f9f228e3e08380ddad59539669f31667d3dd4a7 /indra/llxml/llcontrol.h | |
| parent | ad6425173900855852b8c8437cc88120ea46cc53 (diff) | |
Revert "viewer#819 Avoid reading the same XML file multiple times"
This reverts commit a865d423974ea06dffa47798c81e98e7570b02ec.
Reason for revert: viewer#1420, reverting to not hold maint-A (is deepCopy not full?)
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 e148b74292..a8bc584c48 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -300,7 +300,7 @@ public: // Returns number of controls loaded, 0 if failed // If require_declaration is false, will auto-declare controls it finds // as the given type. - U32 loadFromFileLegacy(const std::string& filename, const std::string& xml, bool require_declaration = true, eControlType declare_as = TYPE_STRING); + 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); void resetToDefaults(); |