diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
commit | c5ae838ce3cd8521b7b4817f153560e03a8dcc32 (patch) | |
tree | 7a489631ed3811ae52fab7bbf6b5a1075aa20e65 /indra/llxml/llcontrol.h | |
parent | ba0c369aa20cdbfd7940a2435dd3c6630f0d54ae (diff) | |
parent | 4047349ade461fa6bac43da2a14c6e7689918aa1 (diff) |
pull improved avatar physics ui and other improvements from Seraph
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(); }; |