summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/reflection_test.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 16:08:10 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 16:08:10 -0800
commitd7b55d0fa7f7f00a3811e62a9874999e9e0d0a8a (patch)
tree27e0077e9366389bd92397f05bf8ea35203bc58e /indra/llcommon/tests/reflection_test.cpp
parentb10b7833ee160fa05a70922bffc191829bf0fb21 (diff)
parentbe210914f4e9081f021cc1ad3b671765aba79b61 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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(...)
{