aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet/licenses.txt
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-18 23:11:30 +0100
committerJustin Clark-Casey (justincc)2010-08-18 23:15:05 +0100
commit11db33d52008a2affb714ca80707543c388e97be (patch)
tree469ab1de9ffabff7ca9f57f9dcb06e8037755853 /bin/assets/TexturesAssetSet/licenses.txt
parentIncreased the timeout on AgentUpdate to 30 sec and improved error message to ... (diff)
downloadopensim-SC_OLD-11db33d52008a2affb714ca80707543c388e97be.zip
opensim-SC_OLD-11db33d52008a2affb714ca80707543c388e97be.tar.gz
opensim-SC_OLD-11db33d52008a2affb714ca80707543c388e97be.tar.bz2
opensim-SC_OLD-11db33d52008a2affb714ca80707543c388e97be.tar.xz
Add textures no longer shipped with newer viewers to OpenSim's standard asset library
These are appropriately licensed and include plant, tree and miscellaneous textures (face target crosshairs, etc). Many thanks to Nebadon for sourcing and packaging these.
Diffstat (limited to '')
-rw-r--r--bin/assets/TexturesAssetSet/licenses.txt22
1 files changed, 22 insertions, 0 deletions
diff --git a/bin/assets/TexturesAssetSet/licenses.txt b/bin/assets/TexturesAssetSet/licenses.txt
index 5d34424..4c1364e 100644
--- a/bin/assets/TexturesAssetSet/licenses.txt
+++ b/bin/assets/TexturesAssetSet/licenses.txt
@@ -35,3 +35,25 @@ A few of the wood textures were created by me using Wood Workshop. These I donat
35 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 35 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
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
396. From Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc.
40
41Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
42artwork and other works in the files distributed with this Notice under
43the Creative Commons Attribution-Share Alike 3.0 License, available at
44http://creativecommons.org/licenses/by- sa/3.0/legalcode. For the license
45summary, see http://creativecommons.org/licenses/by-sa/3.0/.
46
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
49logo, are subject to our trademark policy at
50http://secondlife.com/corporate/trademark/.
51
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
54and clearly identify any changes made to the original works. Include
55this Notice and information where copyright notices are usually included,
56for example, after your own copyright notice acknowledging your use of
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
59your work.