diff options
author | Denis Serdjuk <dserduk@productengine.com> | 2010-02-16 19:08:18 +0200 |
---|---|---|
committer | Denis Serdjuk <dserduk@productengine.com> | 2010-02-16 19:08:18 +0200 |
commit | db3c5d214addc8fe93f3b662fccb1354ef12e01b (patch) | |
tree | c2c7f700a1287d0479eee8d4c0a59e14a41d9350 | |
parent | 6a4aea457159192951b584c05a4d3a80a1d08290 (diff) |
fixed Normal bug EXT-5380 'Place Profile' side panel opens instead 'Search' floater after not-recognized SLURL was entered in Location Field
Changes:Viewer will try to open search browser, if slurl has invalid region name
--HG--
branch : product-engine
-rw-r--r-- | indra/newview/llurldispatcher.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 0b6bd4b401..257afabdcc 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -223,6 +223,17 @@ void LLURLDispatcherImpl::regionNameCallback(U64 region_handle, const std::strin S32 z = 0; LLURLSimString::parse(sim_string, ®ion_name, &x, &y, &z); + // Invalid location? EXT-5380 + if (!region_handle) + { + if(!region_name.empty() && !LLStringOps::isDigit(region_name.c_str()[0]))// it is no sense to search an empty region_name or when the region_name starts with digits + { + // may be an user types incorrect region name, let's help him to find a correct one + LLFloaterReg::showInstance("search", LLSD().with("category", "places").with("id", LLSD(region_name))); + } + //*TODO: add notification about invalid region_name + return; + } LLVector3 local_pos; local_pos.mV[VX] = (F32)x; local_pos.mV[VY] = (F32)y; |