diff options
| author | Tofu Buzzard <no-email> | 2011-03-16 22:44:29 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:29 +0000 |
| commit | 0671b6abc5acee0e7df879f9a10506aa42c2169c (patch) | |
| tree | baf736cc9a5f9de8fb1fa9f9bf95be0dacc7b72f /indra/llxml/llcontrol.cpp | |
| parent | 1dffa1c78cd623fe8c930e128312260647bf91e7 (diff) | |
| parent | 752b3fdbe044069635a2c6cd000c481561985954 (diff) | |
merge
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. |