diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llfloaterparcel.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterparcel.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterparcel.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterparcel.cpp b/linden/indra/newview/llfloaterparcel.cpp index f12467a..4213150 100644 --- a/linden/indra/newview/llfloaterparcel.cpp +++ b/linden/indra/newview/llfloaterparcel.cpp | |||
@@ -19,7 +19,8 @@ | |||
19 | * There are special exceptions to the terms and conditions of the GPL as | 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 | 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 | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 22 | * online at |
23 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
23 | * | 24 | * |
24 | * By copying, modifying or distributing this software, you acknowledge | 25 | * By copying, modifying or distributing this software, you acknowledge |
25 | * that you have read and understood your obligations described above, | 26 | * that you have read and understood your obligations described above, |
@@ -51,9 +52,10 @@ LLMap< const LLUUID, LLFloaterParcelInfo* > gPlaceInfoInstances; | |||
51 | class LLParcelHandler : public LLCommandHandler | 52 | class LLParcelHandler : public LLCommandHandler |
52 | { | 53 | { |
53 | public: | 54 | public: |
54 | // don't allow from external browsers | 55 | // requires trusted browser to trigger |
55 | LLParcelHandler() : LLCommandHandler("parcel", false) { } | 56 | LLParcelHandler() : LLCommandHandler("parcel", true) { } |
56 | bool handle(const LLSD& params, const LLSD& queryMap) | 57 | bool handle(const LLSD& params, const LLSD& query_map, |
58 | LLWebBrowserCtrl* web) | ||
57 | { | 59 | { |
58 | if (params.size() < 2) | 60 | if (params.size() < 2) |
59 | { | 61 | { |