From d725e5b24075b2171f8a5b263969991e9b475078 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 29 Sep 2008 19:14:50 +0000 Subject: QAR-872 Viewer 1.21 RC 3 merge viewer_1-21 96116-97380 -> release --- indra/newview/llviewermessage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e47ffe2d7f..b6c524065c 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -539,9 +539,9 @@ void process_places_reply(LLMessageSystem* msg, void** data) void send_sound_trigger(const LLUUID& sound_id, F32 gain) { - if (sound_id.isNull()) + if (sound_id.isNull() || gAgent.getRegion() == NULL) { - // zero guids don't get sent (no sound) + // disconnected agent or zero guids don't get sent (no sound) return; } -- cgit v1.2.3