diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
| commit | 85ccab2d8178c508e585f987bb076951bf2e9ddb (patch) | |
| tree | 5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/llxml/llcontrol.cpp | |
| parent | 9f2a04f217d54344360edc554456d9804e17eeb7 (diff) | |
| parent | 6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff) | |
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/llxml/llcontrol.cpp')
| -rw-r--r-- | indra/llxml/llcontrol.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 6c72609122..6e4364a20d 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -835,7 +835,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only return num_saved; } -U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values) +U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values, bool save_values) { std::string name; LLSD settings; @@ -908,8 +908,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v } else if(existing_control->isPersisted()) { - - existing_control->setValue(control_map["Value"]); + existing_control->setValue(control_map["Value"], save_values); } // *NOTE: If not persisted and not setting defaults, // the value should not get loaded. |