diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
| commit | 2854008e8edd3419fe37a8c4971223eda5945bfa (patch) | |
| tree | 83640a42fcc5f71200a19e173a95da433760cf74 /indra/newview/llagent.cpp | |
| parent | 1ec47c39a6c4a6e7e518d0b91a87f50596362f06 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
automated 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"); |