diff options
author | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
commit | dd9263d01780fe23b8c329e0fd8d8c140b04c174 (patch) | |
tree | 53f8c1fc6d299576d82b7932079ea0c4d6910990 /indra/newview/llurldispatcher.cpp | |
parent | 9fbee8bd46e1fae770deedb960701899a8e18b84 (diff) | |
parent | 1231c86d2fc1f4a93c97e9c42e58c917f71b6718 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
-rw-r--r-- | indra/newview/llurldispatcher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index f6d7ceeec3..4240a38326 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -167,9 +167,9 @@ bool LLURLDispatcherImpl::dispatchApp(const LLSLURL& slurl, // static bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, const std::string& nav_type, bool right_mouse) { - if(slurl.getType() != LLSLURL::LOCATION) + if(slurl.getType() != LLSLURL::LOCATION) { - return false; + return false; } // Before we're logged in, need to update the startup screen // to tell the user where they are going. |