diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-27 20:12:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-27 20:12:37 -0400 |
| commit | 1ba21762926167580c434e955646c986074988a3 (patch) | |
| tree | 71cad9031ccbf2a871ee2d82ff2ffef4fc5df4e5 /indra | |
| parent | 825fc273ee5167052d811dc058b1834c86e005da (diff) | |
| parent | 298bb68484ec2f44369a1ad2e2b4c84d71d3d9f0 (diff) | |
merge changes for storm-1474
Diffstat (limited to 'indra')
| -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(); |