diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
commit | e0efa1dfa236f8a52a88212298b6e5113ef8f07a (patch) | |
tree | 9a94d26d308981d2070129147b9ba751118bdd76 /indra/newview/llurldispatcher.cpp | |
parent | ef9b7c5b36c7521c4519e682aa312c4c25c31c2f (diff) | |
parent | 890ec637d41330a2a91d23b09b6aaaf49738d19a (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
-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; |