diff options
author | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
commit | 79029149a415a9f32e08d378653199a880d21e65 (patch) | |
tree | 14b6f7d59c66602affd77b6e21f1981b28995fa8 /indra/newview/tests | |
parent | 80552a465e9169b7326c346f4685790ea459823a (diff) | |
parent | 8511385a5407181ced7bb226d4054185c597d05e (diff) |
Automated merge with file:///F:%5Cviewer-bear
Diffstat (limited to 'indra/newview/tests')
-rwxr-xr-x | indra/newview/tests/llagentaccess_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp index 3ba25f3c10..05289f0309 100755 --- a/indra/newview/tests/llagentaccess_test.cpp +++ b/indra/newview/tests/llagentaccess_test.cpp @@ -40,7 +40,7 @@ static U32 test_preferred_maturity = SIM_ACCESS_PG; LLControlGroup::LLControlGroup(const std::string& name) - : LLInstanceTracker<LLControlGroup, std::string>(name) +: LLInstanceTracker<LLControlGroup, std::string>(name) { } |