diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
commit | 67bc42a80ac0c125a719e2d48c974f9259c04551 (patch) | |
tree | e76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/llcommon/tests/reflection_test.cpp | |
parent | 1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff) | |
parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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(...) { |