1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index d307f20b1f..33d9b5eb67 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6674,12 +6674,8 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
         if (flags & BEACON_SHOW_MAP)
         {
             bool old_auto_focus = instance->getAutoFocus();
-            instance->setAutoFocus(false);
+            instance->setAutoFocus(flags & BEACON_FOCUS_MAP);
             instance->openFloater("center");
-            if (flags & BEACON_FOCUS_MAP)
-            {
-                instance->setFocus(true);
-            }
             instance->setAutoFocus(old_auto_focus);
         }
     }