summaryrefslogtreecommitdiff
path: root/indra/newview/llurldispatcher.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-11-14 15:39:41 -0800
committerRichard Linden <none@none>2011-11-14 15:39:41 -0800
commit3c5cdd2948d4c215d70a86a1cab12ae55d3958b9 (patch)
treede94b58ecd23ef5d8e4304602dc8b55a1cc96bd6 /indra/newview/llurldispatcher.cpp
parent7766ccb7731a596d6716e9d0def90b3d7da5fcf3 (diff)
parent98755a62bb414f23919e003101153c20d3ab3f72 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
-rw-r--r--indra/newview/llurldispatcher.cpp4
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.