diff --git a/LICENSE.md b/LICENSE.md index d12ee42..25d4bca 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,23 +2,23 @@ License terms for this project vary by part type. Copyrights are by the original Authors. Please do not delete any credits or license files that are included in this project. +The complete text of the licenses used may be found under [Licenses/](Licenses). + ## Avatar Mesh Built with Blender 2.79 with Avastar 2 RC12. -Ruth 2.0 Copyright 2018 AGPL by Shin Ingen, who can be found at https://plus.google.com/+ShinIngen. - -The following mesh body parts are AGPL. -* Upper Body -* Lower Body -* Bento Hands -* Flat Feet -* High Feet - -The mesh head is CC-BY Linden Lab. -The UV map is CC-BY Linden Lab. -The Avastar rig contains components licensed as CC-BY-3.0 by Machinimatrix.org. -Ruth 2.0 Logo and photos are AGPL by Shin Ingen. +* Ruth 2.0 Copyright 2018 by Shin Ingen, who can be found at https://plus.google.com/+ShinIngen. The following mesh body parts are licensed under AGPL-3.0-or-later: + * Upper Body + * Lower Body + * Bento Hands + * Flat Feet + * High Feet +* The mesh head is CC-BY Linden Lab. +* The UV map is CC-BY Linden Lab. +* The Avastar rig contains components licensed as CC-BY-3.0 by Machinimatrix.org. +* Original Ruth 2.0 Logo and photos are AGPL by Shin Ingen. +* Current R2 Logo is CC-BY Serie Sumei. Various Authors and contributors to the Git Repo in alphabetical order are: * Ada Radius @@ -46,4 +46,3 @@ Elf Ears are AGPL by Fred K. Beckhusen. ## Clothing ... - diff --git a/Licenses/BSD License.txt b/Licenses/0BSD.txt similarity index 100% rename from Licenses/BSD License.txt rename to Licenses/0BSD.txt diff --git a/Licenses/AGPL.txt b/Licenses/AGPL-3.0-or-later.txt similarity index 100% rename from Licenses/AGPL.txt rename to Licenses/AGPL-3.0-or-later.txt diff --git a/Licenses/MIT License.txt b/Licenses/MIT.txt similarity index 100% rename from Licenses/MIT License.txt rename to Licenses/MIT.txt diff --git a/Licenses/README.md b/Licenses/README.md index 1d49736..98511a6 100644 --- a/Licenses/README.md +++ b/Licenses/README.md @@ -1,6 +1,13 @@ # Licenses +We use the SPDX license identifiers (from the [SPDX License List](https://spdx.dev/licenses)) in some places to identify the covered license. + These are included in Licenses/ verbatim, here are the original sources: +* AGPL-3.0-or-later: https://www.gnu.org/licenses/agpl.txt + +* BSD: https://en.wikipedia.org/wiki/BSD_licenses#Previous_license + * CC-BY-3.0: https://creativecommons.org/licenses/by/3.0/legalcode.txt +* MIT: https://opensource.org/licenses/MIT diff --git a/README.md b/README.md index d09458a..d0e0715 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ + + # Ruth2 Mesh Avatar Project Ruth2 is a low-poly mesh body specifically designed for OpenSimulator. diff --git a/Scripts/r2_applier.lsl b/Scripts/r2_applier.lsl index 6eb831c..2ae40ca 100644 --- a/Scripts/r2_applier.lsl +++ b/Scripts/r2_applier.lsl @@ -1,5 +1,5 @@ // r2_applier.lsl - SS Combo skin applier -// SPDX-License-Identifier: CC-BY-3.0 +// SPDX-License-Identifier: MIT // Copyright 2020 Serie Sumei // v2.0 - 09May2020 - New applier script diff --git a/Scripts/r2_hud_debug.lsl b/Scripts/r2_hud_debug.lsl index 53705be..feba1b5 100644 --- a/Scripts/r2_hud_debug.lsl +++ b/Scripts/r2_hud_debug.lsl @@ -1,5 +1,5 @@ // r2_hud_debug.lsl - Debugging functions for the Rut2/Roth2 avatar HUDs -// SPDX-License-Identifier: AGPL-3.0-or-later +// SPDX-License-Identifier: MIT // Copyright 2020 Serie Sumei // v3.0 04Apr2020 - New script, matches to the Ruth2 v3 scripts diff --git a/Scripts/r2_hud_maker.lsl b/Scripts/r2_hud_maker.lsl index 0b3a22a..a725bf9 100644 --- a/Scripts/r2_hud_maker.lsl +++ b/Scripts/r2_hud_maker.lsl @@ -1,17 +1,6 @@ -//********************************************************************************* -//** This program is free software: you can redistribute it and/or modify -//** it under the terms of the GNU Affero General Public License as -//** published by the Free Software Foundation, either version 3 of the -//** License, or (at your option) any later version. -//** -//** This program is distributed in the hope that it will be useful, -//** but WITHOUT ANY WARRANTY; without even the implied warranty of -//** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -//** GNU Affero General Public License for more details. -//** -//** You should have received a copy of the GNU Affero General Public License -//** along with this program. If not, see -//********************************************************************************* +// r2_hud_maker.lsl - RuthAndRoth HUD Creation +// SPDX-License-Identifier: MIT +// Copyright 2020 Serie Sumei // v3.0 02Apr2020 - Based on ss-r from Control/Serie Sumei diff --git a/Scripts/r2_xtea.lsl b/Scripts/r2_xtea.lsl index eb92e84..c12a1ac 100644 --- a/Scripts/r2_xtea.lsl +++ b/Scripts/r2_xtea.lsl @@ -1,5 +1,5 @@ // r2_xtea.lsl - xtea MessageLinked wrapper -// SPDX-License-Identifier: CC-BY-3.0 +// SPDX-License-Identifier: MIT // Modifications Copyright 2019 Serie Sumei // v1 - Initial release @@ -43,7 +43,7 @@ // it a constant below. This requires the script to be distributed in // products no-modify. The licensing of both versions allow this, the XTEA in // Fred's version is BSD, the original version of this one is public domain -// per the code headers and all modifications are CC-BY-3.0. +// per the code headers and all modifications are MIT. // This is the shared secret that is required at both ends to communicate // CHANGE THIS if you need any security at all diff --git a/Textures/r2-logo-white-grey.png b/Textures/r2-logo-white-grey.png new file mode 100644 index 0000000..4c68fd1 Binary files /dev/null and b/Textures/r2-logo-white-grey.png differ