diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
| commit | 569f322f0d43ba4e1f079d362d333af5b84a0e32 (patch) | |
| tree | 7141309c52129400982944d1f91667b74d65c6cb /indra/newview/llagent.cpp | |
| parent | 8421d3dcd3aad07efecbfa490ccc8e71119b9cab (diff) | |
| parent | b98ebdecda66a1f08e74321cb255e39edfbc47dd (diff) | |
PE merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | 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 69d4bba16d..f434782977 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3203,9 +3203,9 @@ bool LLAgent::teleportCore(bool is_local) // yet if the teleport will succeed. Look in // process_teleport_location_reply - // close the map and find panels so we can see our destination + // close the map panel so we can see our destination. + // we don't close search floater, see EXT-5840. LLFloaterReg::hideInstance("world_map"); - LLFloaterReg::hideInstance("search"); // hide land floater too - it'll be out of date LLFloaterReg::hideInstance("about_land"); |