aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/doc
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/doc/LICENSE-logos.txt23
-rw-r--r--linden/doc/contributions.txt2
2 files changed, 25 insertions, 0 deletions
diff --git a/linden/doc/LICENSE-logos.txt b/linden/doc/LICENSE-logos.txt
new file mode 100644
index 0000000..e63c48e
--- /dev/null
+++ b/linden/doc/LICENSE-logos.txt
@@ -0,0 +1,23 @@
1COPYRIGHT AND PERMISSION NOTICE
2
3Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc.
4
5Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
6artwork and other works in the files distributed with this Notice under
7the Creative Commons Attribution-Share Alike 3.0 License, available at
8http://creativecommons.org/licenses/by-sa/3.0/legalcode. For the license
9summary, see http://creativecommons.org/licenses/by-sa/3.0/.
10
11Notwithstanding the foregoing, all of Linden Lab's trademarks, including
12but not limited to the Second Life brand name and Second Life Eye-in-Hand
13logo, are subject to our trademark policy at
14http://secondlife.com/corporate/trademark/.
15
16If you distribute any copies or adaptations of the Second Life viewer
17artwork or any other works in these files, you must include this Notice
18and clearly identify any changes made to the original works. Include
19this Notice and information where copyright notices are usually included,
20for example, after your own copyright notice acknowledging your use of
21the Second Life viewer artwork, in a text file distributed with your
22program, in your application's About window, or on a credits page for
23your work.
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 1cbc2dd..931794c 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -592,6 +592,8 @@ TBBle Kurosawa
592 VWR-1892 592 VWR-1892
593Teardrops Fall 593Teardrops Fall
594 VWR-5366 594 VWR-5366
595Techwolf Lupindo
596 SNOW-334
595tenebrous pau 597tenebrous pau
596 VWR-247 598 VWR-247
597Tharax Ferraris 599Tharax Ferraris