diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
| commit | fecec49081419dbd7a66533e4d0457784b8d26a0 (patch) | |
| tree | 457018dc36300b5c2a355aedd771861d6b300697 /indra/newview/llagent.cpp | |
| parent | c70a357a274d5acd7921c3185dc34b89069d4e61 (diff) | |
| parent | 5c0df02df5abdadbf17235ae5d7208963c25f1ce (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(); |