summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-11-02 14:09:43 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-11-02 14:09:43 -0500
commit11c428759e0b99fc34e219181d81d024b0323b4d (patch)
treee6ee27fa90d7767ac8f959c97474ee34bab00211 /indra/test
parent84150294b912d04e345007b65670c0230a2e4d79 (diff)
parent77da469d6f7901ee0cddf5fb351cd2a756b217f0 (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