aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatermap.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llfloatermap.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloatermap.cpp47
1 files changed, 3 insertions, 44 deletions
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 97d0041..952c56a 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -2,6 +2,8 @@
2 * @file llfloatermap.cpp 2 * @file llfloatermap.cpp
3 * @brief The "mini-map" or radar in the upper right part of the screen. 3 * @brief The "mini-map" or radar in the upper right part of the screen.
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#include "llviewerprecompiledheaders.h" 32#include "llviewerprecompiledheaders.h"
@@ -217,47 +220,3 @@ void LLFloaterMap::toggle(void*)
217 } 220 }
218 } 221 }
219} 222}
220
221
222BOOL process_secondlife_url(LLString url)
223{
224 S32 strpos, strpos2;
225
226 LLString slurlID = "slurl.com/secondlife/";
227 strpos = url.find(slurlID);
228
229 if (strpos < 0)
230 {
231 slurlID="secondlife://";
232 strpos = url.find(slurlID);
233 }
234
235 if (strpos >= 0)
236 {
237 LLString simname;
238
239 strpos+=slurlID.length();
240 strpos2=url.find("/",strpos);
241 if (strpos2 < strpos) strpos2=url.length();
242 simname="secondlife://" + url.substr(strpos,url.length() - strpos);
243
244 LLURLSimString::setString( simname );
245 LLURLSimString::parse();
246
247 // if there is a world map
248 if ( gFloaterWorldMap )
249 {
250 // mark where the destination is
251 gFloaterWorldMap->trackURL( LLURLSimString::sInstance.mSimName.c_str(),
252 LLURLSimString::sInstance.mX,
253 LLURLSimString::sInstance.mY,
254 LLURLSimString::sInstance.mZ );
255
256 // display map
257 LLFloaterWorldMap::show( NULL, TRUE );
258 };
259
260 return TRUE;
261 }
262 return FALSE;
263}