diff options
author | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
commit | a8a62201ba762e98dff92cf49033e577fc34d8d4 (patch) | |
tree | 11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/newview/llfloaterparcel.cpp | |
parent | Second Life viewer sources 1.18.6.4-RC (diff) | |
download | meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2 meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz |
Second Life viewer sources 1.19.0.0
Diffstat (limited to 'linden/indra/newview/llfloaterparcel.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterparcel.cpp | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/linden/indra/newview/llfloaterparcel.cpp b/linden/indra/newview/llfloaterparcel.cpp index 7123caf..e3189a9 100644 --- a/linden/indra/newview/llfloaterparcel.cpp +++ b/linden/indra/newview/llfloaterparcel.cpp | |||
@@ -4,16 +4,26 @@ | |||
4 | * Parcel information as shown in a floating window from secondlife:// command | 4 | * Parcel information as shown in a floating window from secondlife:// command |
5 | * handler. | 5 | * handler. |
6 | * | 6 | * |
7 | * $LicenseInfo:firstyear=2002&license=internal$ | 7 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
8 | * | 8 | * |
9 | * Copyright (c) 2002-2008, Linden Research, Inc. | 9 | * Copyright (c) 2007-2008, Linden Research, Inc. |
10 | * | 10 | * |
11 | * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of | 11 | * Second Life Viewer Source Code |
12 | * this source code is governed by the Linden Lab Source Code Disclosure | 12 | * The source code in this file ("Source Code") is provided by Linden Lab |
13 | * Agreement ("Agreement") previously entered between you and Linden | 13 | * to you under the terms of the GNU General Public License, version 2.0 |
14 | * Lab. By accessing, using, copying, modifying or distributing this | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
15 | * software, you acknowledge that you have been informed of your | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
16 | * obligations under the Agreement and agree to abide by those obligations. | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 | ||
18 | * | ||
19 | * There are special exceptions to the terms and conditions of the GPL as | ||
20 | * it is applied to this Source Code. View the full text of the exception | ||
21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | ||
22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
23 | * | ||
24 | * By copying, modifying or distributing this software, you acknowledge | ||
25 | * that you have read and understood your obligations described above, | ||
26 | * and agree to abide by those obligations. | ||
17 | * | 27 | * |
18 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 28 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
19 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 29 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
@@ -41,7 +51,8 @@ LLMap< const LLUUID, LLFloaterParcelInfo* > gPlaceInfoInstances; | |||
41 | class LLParcelHandler : public LLCommandHandler | 51 | class LLParcelHandler : public LLCommandHandler |
42 | { | 52 | { |
43 | public: | 53 | public: |
44 | LLParcelHandler() : LLCommandHandler("parcel") { } | 54 | // don't allow from external browsers |
55 | LLParcelHandler() : LLCommandHandler("parcel", false) { } | ||
45 | bool handle(const LLSD& params, const LLSD& queryMap) | 56 | bool handle(const LLSD& params, const LLSD& queryMap) |
46 | { | 57 | { |
47 | if (params.size() < 2) | 58 | if (params.size() < 2) |