From b5b5aa73539fa7402a9eed9842108f32b27abd97 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 16 Mar 2010 16:19:33 -0700 Subject: Fixes EXT-1659; disable cancel button once server reports teleport finished. --- indra/newview/llviewermessage.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index eed3f25231..5f7b19a5cb 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2923,6 +2923,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**) LL_WARNS("Messaging") << "Got teleport notification for wrong agent!" << LL_ENDL; return; } + + // Teleport is finished; it can't be cancelled now. + gViewerWindow->setProgressCancelButtonVisible(FALSE); // Do teleport effect for where you're leaving // VEFFECT: TeleportStart -- cgit v1.2.3