diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:22:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:22:43 -0400 |
| commit | fb1facf13a2f7413b42802bd7293d504eb4e4174 (patch) | |
| tree | 9f0e5b980fa2d2e2d4bf97902610456fa279d6cd /indra/llxml/llcontrol.cpp | |
| parent | a4f2c570dd42066f0e2738a0fd2de6c61c35b47b (diff) | |
| parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) | |
syncing up to viewer-development
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. |