summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/reflection_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-12-10 15:24:08 -0500
committerOz Linden <oz@lindenlab.com>2012-12-10 15:24:08 -0500
commit623a06aabd9d7e5c7e74211360aa233ec33e4977 (patch)
tree21c815db542e45fc07473cd26a24561c5f27add8 /indra/llcommon/tests/reflection_test.cpp
parentd56a98dea4c7523a759bea4740d8bdde1df15e30 (diff)
parenta9ada0cc6a1418da0908f995b1369912a270b22d (diff)
merge release tag
Diffstat (limited to 'indra/llcommon/tests/reflection_test.cpp')
-rw-r--r--indra/llcommon/tests/reflection_test.cpp2
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(...)
{