summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/reflection_test.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-19 12:01:51 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-19 12:01:51 -0800
commit62301cb883dd6fadcd5d30acd604f72d2c0b1794 (patch)
treebaa94e42e64a07351c8e9722c578e94b43a811d8 /indra/llcommon/tests/reflection_test.cpp
parent6036ee9c421154a83a306bc16533e47f9494fd32 (diff)
parent185169cbbecebe2a35dbd937d6fb4e0a30fa1832 (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(...)
{