diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
| commit | 1fa2afbe2007690612f360eff3603a353ee95672 (patch) | |
| tree | bd5a48c23a2280afcd0115cc6dd1d70764162b1c /indra/newview/llagent.cpp | |
| parent | fe14e50a45a450cd7bcdfe73a8bbda03c018053f (diff) | |
| parent | 4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 492cfe7c1b..642a1907f0 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -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(); |