aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/licenses.txt
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-19 00:54:48 +0100
committerJustin Clark-Casey (justincc)2010-08-19 00:54:48 +0100
commit5e3d53bef2b1d1473a54a92ff8035bf04d422b0c (patch)
tree0fa5281da45eca965f413d73fb71173387535db8 /bin/assets/TexturesAssetSet/licenses.txt
parentminor: Correct string format in "Can't find linkset root prim" message (diff)
parentOne more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. (diff)
downloadopensim-SC-5e3d53bef2b1d1473a54a92ff8035bf04d422b0c.zip
opensim-SC-5e3d53bef2b1d1473a54a92ff8035bf04d422b0c.tar.gz
opensim-SC-5e3d53bef2b1d1473a54a92ff8035bf04d422b0c.tar.bz2
opensim-SC-5e3d53bef2b1d1473a54a92ff8035bf04d422b0c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/assets/TexturesAssetSet/licenses.txt40
1 files changed, 20 insertions, 20 deletions
diff --git a/bin/assets/TexturesAssetSet/licenses.txt b/bin/assets/TexturesAssetSet/licenses.txt
index 4c1364e..f34d26f 100644
--- a/bin/assets/TexturesAssetSet/licenses.txt
+++ b/bin/assets/TexturesAssetSet/licenses.txt
@@ -36,24 +36,24 @@ A few of the wood textures were created by me using Wood Workshop. These I donat
36 36
37 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 37 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
38 38
396. From Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. 396. From Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc.
40 40
41Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer 41Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
42artwork and other works in the files distributed with this Notice under 42artwork and other works in the files distributed with this Notice under
43the Creative Commons Attribution-Share Alike 3.0 License, available at 43the Creative Commons Attribution-Share Alike 3.0 License, available at
44http://creativecommons.org/licenses/by- sa/3.0/legalcode. For the license 44http://creativecommons.org/licenses/by- sa/3.0/legalcode. For the license
45summary, see http://creativecommons.org/licenses/by-sa/3.0/. 45summary, see http://creativecommons.org/licenses/by-sa/3.0/.
46 46
47Notwithstanding the foregoing, all of Linden Lab's trademarks, including 47Notwithstanding the foregoing, all of Linden Lab's trademarks, including
48but not limited to the Second Life brand name and Second Life Eye-in-Hand 48but not limited to the Second Life brand name and Second Life Eye-in-Hand
49logo, are subject to our trademark policy at 49logo, are subject to our trademark policy at
50http://secondlife.com/corporate/trademark/. 50http://secondlife.com/corporate/trademark/.
51 51
52If you distribute any copies or adaptations of the Second Life viewer 52If you distribute any copies or adaptations of the Second Life viewer
53artwork or any other works in these files, you must include this Notice 53artwork or any other works in these files, you must include this Notice
54and clearly identify any changes made to the original works. Include 54and clearly identify any changes made to the original works. Include
55this Notice and information where copyright notices are usually included, 55this Notice and information where copyright notices are usually included,
56for example, after your own copyright notice acknowledging your use of 56for example, after your own copyright notice acknowledging your use of
57the Second Life viewer artwork, in a text file distributed with your 57the Second Life viewer artwork, in a text file distributed with your
58program, in your application's About window, or on a credits page for 58program, in your application's About window, or on a credits page for
59your work. 59your work.