summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-05-26 20:15:42 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-05-26 20:15:42 -0400
commitdf55db4aa02ef02169d318b1d8b607c2edb3ba5d (patch)
treec8d586ca1ab4b54d0b1a65338a79fae59222fc18 /indra/test
parentf3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff)
parent234ea528505d0363c4c4eb0150e7587e863c8e20 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/test')
-rwxr-xr-xindra/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 aa23699de0..b9c025f518 100755
--- 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