diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
| commit | d3023153e9c7aa2eaf18468e8d81aebf0d6223e0 (patch) | |
| tree | f1265d15e702f1dd449476fd5e7b956ccd7f33f8 /indra/llxml/llcontrol.cpp | |
| parent | 7766d424d0f8cf8a6c882f50bc4dd04bf8f2096b (diff) | |
| parent | cb47ae3264f3d9d22add17f2cbc5699c8620705f (diff) | |
merge changes for storm-1035
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. |