From a926cdad1a896d61cf10478af96f4c0bb0703431 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 1 Oct 2021 23:04:46 +0300 Subject: SL-16123 Don't close Search or Map floaters when user teleports Brief reason: This breaks the use case of searching for places to go and trying several of them. Inconsistent with Destinations and other floaters. --- indra/newview/llagent.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'indra') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 389448654a..29562fe342 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3901,26 +3901,12 @@ bool LLAgent::teleportCore(bool is_local) // yet if the teleport will succeed. Look in // process_teleport_location_reply - // close the map panel so we can see our destination. - // we don't close search floater, see EXT-5840. - LLFloaterReg::hideInstance("world_map"); - // hide land floater too - it'll be out of date LLFloaterReg::hideInstance("about_land"); // hide the Region/Estate floater LLFloaterReg::hideInstance("region_info"); - // minimize the Search floater (STORM-1474) - { - LLFloater* instance = LLFloaterReg::getInstance("search"); - - if (instance && instance->getVisible()) - { - instance->setMinimized(TRUE); - } - } - LLViewerParcelMgr::getInstance()->deselectLand(); LLViewerMediaFocus::getInstance()->clearFocus(); -- cgit v1.2.3