summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 19:52:45 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 19:52:45 -0400
commita1741be7f6e4d67be55d6a5bc628c38390f9d4b4 (patch)
tree5c02bd701c5e55cfcf9fbe8af34cb2ae4b2c9995 /indra/test
parent9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff)
parent3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
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