diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-09 09:40:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-09 09:40:18 +0100 |
| commit | 467a8b0441e139773775ecf306f430f44814bff5 (patch) | |
| tree | d9cce1c6675234a55d6761cc6f0fddd5ef3dda0d /indra/newview/llagent.cpp | |
| parent | 9ba22cee0e8c6d73bee33689553e5371a2ef0942 (diff) | |
| parent | e3cd72f7bd69d0ef0148a1e98e5fc9c5dfe11018 (diff) | |
merge from PE's viewer-release
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(); |