diff options
author | Diva Canto | 2010-08-19 09:17:08 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-19 09:17:08 -0700 |
commit | 31365e3ec49da9e6f5bb7799ee28d2d85ccfcf3a (patch) | |
tree | 5c509bd808eb2855703b2263c86bb5a9cfe0b346 /bin/assets/TexturesAssetSet/licenses.txt | |
parent | Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943." (diff) | |
download | opensim-SC_OLD-31365e3ec49da9e6f5bb7799ee28d2d85ccfcf3a.zip opensim-SC_OLD-31365e3ec49da9e6f5bb7799ee28d2d85ccfcf3a.tar.gz opensim-SC_OLD-31365e3ec49da9e6f5bb7799ee28d2d85ccfcf3a.tar.bz2 opensim-SC_OLD-31365e3ec49da9e6f5bb7799ee28d2d85ccfcf3a.tar.xz |
These files want to be committed. This time I'm doing it separately from other commits.
Diffstat (limited to '')
-rw-r--r-- | bin/assets/TexturesAssetSet/licenses.txt | 40 |
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 | ||
39 | 6. From Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. | 39 | 6. From Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. |
40 | 40 | ||
41 | Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer | 41 | Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer |
42 | artwork and other works in the files distributed with this Notice under | 42 | artwork and other works in the files distributed with this Notice under |
43 | the Creative Commons Attribution-Share Alike 3.0 License, available at | 43 | the Creative Commons Attribution-Share Alike 3.0 License, available at |
44 | http://creativecommons.org/licenses/by- sa/3.0/legalcode. For the license | 44 | http://creativecommons.org/licenses/by- sa/3.0/legalcode. For the license |
45 | summary, see http://creativecommons.org/licenses/by-sa/3.0/. | 45 | summary, see http://creativecommons.org/licenses/by-sa/3.0/. |
46 | 46 | ||
47 | Notwithstanding the foregoing, all of Linden Lab's trademarks, including | 47 | Notwithstanding the foregoing, all of Linden Lab's trademarks, including |
48 | but not limited to the Second Life brand name and Second Life Eye-in-Hand | 48 | but not limited to the Second Life brand name and Second Life Eye-in-Hand |
49 | logo, are subject to our trademark policy at | 49 | logo, are subject to our trademark policy at |
50 | http://secondlife.com/corporate/trademark/. | 50 | http://secondlife.com/corporate/trademark/. |
51 | 51 | ||
52 | If you distribute any copies or adaptations of the Second Life viewer | 52 | If you distribute any copies or adaptations of the Second Life viewer |
53 | artwork or any other works in these files, you must include this Notice | 53 | artwork or any other works in these files, you must include this Notice |
54 | and clearly identify any changes made to the original works. Include | 54 | and clearly identify any changes made to the original works. Include |
55 | this Notice and information where copyright notices are usually included, | 55 | this Notice and information where copyright notices are usually included, |
56 | for example, after your own copyright notice acknowledging your use of | 56 | for example, after your own copyright notice acknowledging your use of |
57 | the Second Life viewer artwork, in a text file distributed with your | 57 | the Second Life viewer artwork, in a text file distributed with your |
58 | program, in your application's About window, or on a credits page for | 58 | program, in your application's About window, or on a credits page for |
59 | your work. | 59 | your work. |