summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-01-18 10:26:54 +0000
committerLynx Linden <lynx@lindenlab.com>2010-01-18 10:26:54 +0000
commita3ca39a437b645be986b9a1fa65821d971d26bcc (patch)
treeb6caa9e1632a3519de8c0d0e0551b45642d2c626
parent4d3421fe1b147179af7e71a28421b08a6032e709 (diff)
EXT-4462: Support secondlife:///app/worldmap
Without any location arguments, simply opens the world map floater.
-rw-r--r--indra/newview/llfloaterworldmap.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index a00d7abd17..f4d4ea3553 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -116,9 +116,12 @@ public:
{
if (params.size() == 0)
{
- return false;
+ // support the secondlife:///app/worldmap SLapp
+ LLFloaterReg::showInstance("world_map", "center");
+ return true;
}
+ // support the secondlife:///app/worldmap/{LOCATION}/{COORDS} SLapp
const std::string region_name = params[0].asString();
S32 x = (params.size() > 1) ? params[1].asInteger() : 128;
S32 y = (params.size() > 2) ? params[2].asInteger() : 128;