summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-01 23:04:46 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-01 23:06:10 +0300
commita926cdad1a896d61cf10478af96f4c0bb0703431 (patch)
tree6377c0b1c3233ba394fbe2e4acb05c12315add89
parent1dffd2a2fe8b2c0835460b84fd63fd19aa74d890 (diff)
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.
-rw-r--r--indra/newview/llagent.cpp14
1 files changed, 0 insertions, 14 deletions
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();