diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
| commit | 037a83cd47e016f70092bccfdb2c13e759c6ff0a (patch) | |
| tree | 2183c8ef1364d5f4e784cb91ea4d67b1861b2452 /indra/llxml/llcontrol.h | |
| parent | 15b0509c01dbeec6854f4a0a5965e900eda06de1 (diff) | |
| parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) | |
Automated merge up from viewer-development into mesh-development
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 93975579cc..e402061e1f 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -289,7 +289,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); + U32 loadFromFile(const std::string& filename, bool default_values = false, bool save_values = true); void resetToDefaults(); }; |