diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-04 20:23:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-04 20:23:49 -0400 |
| commit | 09f2c4e740070f32fdb6f02392c8533857d3ccfc (patch) | |
| tree | bdd3e02a6568ef2b99db976a70c00b3da0470caf /doc | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
| parent | dc5960d3930efa482b7de205fc9b8d08785da4c8 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/LICENSE-logos.txt | 2 | ||||
| -rwxr-xr-x | doc/LICENSE-source.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt index e63c48e542..66f8745f4f 100755 --- a/doc/LICENSE-logos.txt +++ b/doc/LICENSE-logos.txt @@ -11,7 +11,7 @@ summary, see http://creativecommons.org/licenses/by-sa/3.0/. Notwithstanding the foregoing, all of Linden Lab's trademarks, including but not limited to the Second Life brand name and Second Life Eye-in-Hand logo, are subject to our trademark policy at -http://secondlife.com/corporate/trademark/. +http://secondlife.com/corporate/brand/trademark/. If you distribute any copies or adaptations of the Second Life viewer artwork or any other works in these files, you must include this Notice diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt index 407402265e..3de5123415 100755 --- a/doc/LICENSE-source.txt +++ b/doc/LICENSE-source.txt @@ -7,7 +7,9 @@ you under the terms of the GNU Lesser General Public License, version 2.1 ("LGPL"), unless you have obtained a separate licensing agreement ("Other License"), formally executed by you and Linden Lab. Terms of the GPL can be found in doc/LGPL-license.txt in this distribution, or -online at http://secondlife.com/developers/opensource/lgplv2_1 +online at + +https://wiki.secondlife.com/wiki/Linden_Lab_Official:GNU_Lesser_General_Public_License,_version_2.1 By copying, modifying or distributing this software, you acknowledge that you have read and understood your obligations described above, |