aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llplugin/llpluginmessagepipe.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-06-14 17:51:51 +0200
committerArmin Weatherwax2010-09-23 15:42:38 +0200
commit093b99196f27b518b183953cade1077fa6d7c5ed (patch)
tree154ce4bfa2fbdeae561aa4b115568e4ec2680861 /linden/indra/llplugin/llpluginmessagepipe.cpp
parentupdate to latest SG2 media_plugins (diff)
downloadmeta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.zip
meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.gz
meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.bz2
meta-impy-093b99196f27b518b183953cade1077fa6d7c5ed.tar.xz
update llplugin to latest version of SG2, pull latest webkit
Diffstat (limited to 'linden/indra/llplugin/llpluginmessagepipe.cpp')
-rwxr-xr-xlinden/indra/llplugin/llpluginmessagepipe.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp
index 85ed227..b16381c 100755
--- a/linden/indra/llplugin/llpluginmessagepipe.cpp
+++ b/linden/indra/llplugin/llpluginmessagepipe.cpp
@@ -13,13 +13,13 @@
13 * ("GPL"), unless you have obtained a separate licensing agreement 13 * ("GPL"), unless you have obtained a separate licensing agreement
14 * ("Other License"), formally executed by you and Linden Lab. Terms of 14 * ("Other License"), formally executed by you and Linden Lab. Terms of
15 * the GPL can be found in doc/GPL-license.txt in this distribution, or 15 * the GPL can be found in doc/GPL-license.txt in this distribution, or
16 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 16 * online at http://secondlife.com/developers/opensource/gplv2
17 * 17 *
18 * There are special exceptions to the terms and conditions of the GPL as 18 * There are special exceptions to the terms and conditions of the GPL as
19 * it is applied to this Source Code. View the full text of the exception 19 * it is applied to this Source Code. View the full text of the exception
20 * in the file doc/FLOSS-exception.txt in this software distribution, or 20 * in the file doc/FLOSS-exception.txt in this software distribution, or
21 * online at 21 * online at
22 * http://secondlifegrid.net/programs/open_source/licensing/flossexception 22 * http://secondlife.com/developers/opensource/flossexception
23 * 23 *
24 * By copying, modifying or distributing this software, you acknowledge 24 * By copying, modifying or distributing this software, you acknowledge
25 * that you have read and understood your obligations described above, 25 * that you have read and understood your obligations described above,
@@ -29,6 +29,7 @@
29 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 29 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
30 * COMPLETENESS OR PERFORMANCE. 30 * COMPLETENESS OR PERFORMANCE.
31 * $/LicenseInfo$ 31 * $/LicenseInfo$
32 *
32 * @endcond 33 * @endcond
33 */ 34 */
34 35