diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-12 14:38:45 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-12 14:38:45 +0300 |
| commit | d07a354d0afd2db68b8a0b4fe3166e59553da8fd (patch) | |
| tree | a27fdfb4da0b08762b010aa4e626b9b8b9125e23 /indra/newview/llagent.cpp | |
| parent | 67a06e4df25aecd688938d437cb6ed0d150171fa (diff) | |
| parent | c371f359dc211f551c9ee3a999a77cee8027c6fa (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 345953f2e9..4e5fdb1219 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3234,6 +3234,9 @@ bool LLAgent::teleportCore(bool is_local) // hide land floater too - it'll be out of date LLFloaterReg::hideInstance("about_land"); + // hide the search floater (EXT-8276) + LLFloaterReg::hideInstance("search"); + LLViewerParcelMgr::getInstance()->deselectLand(); LLViewerMediaFocus::getInstance()->clearFocus(); |