merging in latest viewer-dev to mesh merge branch

meow-7.2.2
Nyx (Neal Orman) 2011-07-28 11:37:10 -04:00
commit c6ee98394e
1 changed files with 2 additions and 2 deletions

View File

@ -3356,8 +3356,8 @@ bool LLAgent::teleportCore(bool is_local)
// hide the Region/Estate floater
LLFloaterReg::hideInstance("region_info");
// hide the search floater (EXT-8276)
LLFloaterReg::hideInstance("search");
// minimize the Search floater (STORM-1474)
LLFloaterReg::getInstance("search")->setMinimized(TRUE);
LLViewerParcelMgr::getInstance()->deselectLand();
LLViewerMediaFocus::getInstance()->clearFocus();