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/newview/tests/llagentaccess_test.cpp | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
| parent | e121f3f409873989ec66193eb97b868ce8ad7f29 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/newview/tests/llagentaccess_test.cpp')
| -rwxr-xr-x | indra/newview/tests/llagentaccess_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp index 3ba25f3c10..1f379ead32 100755 --- a/indra/newview/tests/llagentaccess_test.cpp +++ b/indra/newview/tests/llagentaccess_test.cpp @@ -49,10 +49,10 @@ LLControlGroup::~LLControlGroup() } // Implementation of just the LLControlGroup methods we requre -BOOL LLControlGroup::declareU32(const std::string& name, U32 initial_val, const std::string& comment, BOOL persist) +LLControlVariable* LLControlGroup::declareU32(const std::string& name, U32 initial_val, const std::string& comment, BOOL persist) { test_preferred_maturity = initial_val; - return true; + return NULL; } void LLControlGroup::setU32(const std::string& name, U32 val) |