summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-16 11:04:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-16 11:04:12 -0400
commit099e3b41668a8c951cf74ec585ed4192bab507db (patch)
tree5481b7cbb15e5674d552fb063227c1277bcdb78b /indra/test
parent51bb369a39142ff5049f753099f9638ce68b95dc (diff)
parentd2c3c2f9fe197b1856e9a8ed37aeb56b77e2ff07 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/test')
-rw-r--r--indra/test/message_tut.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp
index 8718360f0c..76063e6db1 100644
--- a/indra/test/message_tut.cpp
+++ b/indra/test/message_tut.cpp
@@ -103,7 +103,7 @@ namespace tut
~LLMessageSystemTestData()
{
// not end_messaging_system()
- delete gMessageSystem;
+ delete static_cast<LLMessageSystem*>(gMessageSystem);
gMessageSystem = NULL;
// rm contents of temp dir