summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/reflection_test.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 17:03:11 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 17:03:11 -0800
commite173dea8a0b235a4664bfba213e96bed090069bf (patch)
tree46b476ee361463e2035d7be5ce5eeb0d2d039915 /indra/llcommon/tests/reflection_test.cpp
parentdd6b684c70e5b732bebae0303c9dcf383332d295 (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(...)
{