diff options
author | Nicky <nicky.dasmijn@gmail.com> | 2022-02-28 22:04:05 +0100 |
---|---|---|
committer | Nicky <nicky.dasmijn@gmail.com> | 2022-02-28 22:04:05 +0100 |
commit | 43031968a653899f62755b6d7b7e28b7fedc24d9 (patch) | |
tree | c610012c5d4e568d94dea4208a80fe1be53ff2bf /indra/newview/llagent.cpp | |
parent | 07d7dcc0be9b793b1bcef63f526b441a58a9b764 (diff) | |
parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) |
Merge remote-tracking branch 'll/master'
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 50e0d1d935..9cae1dd930 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3911,16 +3911,6 @@ bool LLAgent::teleportCore(bool is_local) // 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(); |