summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-03-16 16:19:33 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-03-16 16:19:33 -0700
commitb5b5aa73539fa7402a9eed9842108f32b27abd97 (patch)
treeed61707fed537dc47d4a4ff86c98d73250e64919 /indra/newview
parentfd9807424352269e6daf7c055e209dc6599de132 (diff)
Fixes EXT-1659; disable cancel button once server reports teleport finished.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermessage.cpp3
1 files changed, 3 insertions, 0 deletions
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