diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-13 10:50:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-13 10:50:16 -0500 |
| commit | 7e779a29c142feaa34a30dff39b72d0ae7c0fdc3 (patch) | |
| tree | 401447b5d265520c12de5c4929f0e72468882b68 /indra/llcommon/tests/reflection_test.cpp | |
| parent | 42c957e9d823ee5124fa1ac992fc0e803a3b0d9a (diff) | |
| parent | 7cef2e02565977d3894dbd7c9bde91fb39d9066a (diff) | |
merge changes for DRTVWR-209
Diffstat (limited to 'indra/llcommon/tests/reflection_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/reflection_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/tests/reflection_test.cpp b/indra/llcommon/tests/reflection_test.cpp index 59491cd1fe..8980ebb1f1 100644 --- a/indra/llcommon/tests/reflection_test.cpp +++ b/indra/llcommon/tests/reflection_test.cpp @@ -207,7 +207,7 @@ namespace tut const LLReflective* reflective = property->get(aggregated_data); // Wrong reflective type, should throw exception. // useless op to get rid of compiler warning. - reflective = NULL; + reflective = reflective; } catch(...) { |