diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-07-28 11:37:10 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-07-28 11:37:10 -0400 |
| commit | c6ee98394e3d4b90bdffb4c84d03afc8d3d2d955 (patch) | |
| tree | 31a3b1143b43add8a8fa835f21ec8bebd0f9f324 /indra/newview | |
| parent | cd923af21f4fa6e251dea47ffb53ace934a382d1 (diff) | |
| parent | 1ba21762926167580c434e955646c986074988a3 (diff) | |
merging in latest viewer-dev to mesh merge branch
Diffstat (limited to 'indra/newview')
| -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(); |