diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-22 22:24:32 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-22 22:24:32 -0400 |
| commit | 39bd14f3ca26c04072dcee68c5757232412f4014 (patch) | |
| tree | 9d1081d315c4d80c3e94e3e4af9300f7a422800a /indra/llxml/tests/llcontrol_test.cpp | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
| parent | e121f3f409873989ec66193eb97b868ce8ad7f29 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/llxml/tests/llcontrol_test.cpp')
| -rwxr-xr-x | indra/llxml/tests/llcontrol_test.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp index ede81956ec..c273773c9b 100755 --- a/indra/llxml/tests/llcontrol_test.cpp +++ b/indra/llxml/tests/llcontrol_test.cpp @@ -128,7 +128,11 @@ namespace tut template<> template<> void control_group_t::test<3>() { - int results = mCG->loadFromFile(mTestConfigFile.c_str()); + // Pass default_values = true. This tells loadFromFile() we're loading + // a default settings file that declares variables, rather than a user + // settings file. When loadFromFile() encounters an unrecognized user + // settings variable, it forcibly preserves it (CHOP-962). + int results = mCG->loadFromFile(mTestConfigFile.c_str(), true); LLControlVariable* control = mCG->getControl("TestSetting"); LLSD new_value = 13; control->setValue(new_value, FALSE); |