diff options
author | Melanie Thielker | 2015-09-13 21:03:38 +0200 |
---|---|---|
committer | Melanie Thielker | 2015-09-13 21:03:38 +0200 |
commit | f24414c063261d279490a73510af413da6d05d7b (patch) | |
tree | 3f56b2e9232378c0370a8720118d06f5a8ea9f8b /OpenSim | |
parent | change the names also on the assembyInfo files (diff) | |
download | opensim-SC_OLD-f24414c063261d279490a73510af413da6d05d7b.zip opensim-SC_OLD-f24414c063261d279490a73510af413da6d05d7b.tar.gz opensim-SC_OLD-f24414c063261d279490a73510af413da6d05d7b.tar.bz2 opensim-SC_OLD-f24414c063261d279490a73510af413da6d05d7b.tar.xz |
Remove the last proprietary copyright headers, insert BSD ones.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | 32 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs | 32 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IAttachmentsService.cs | 33 |
5 files changed, 81 insertions, 20 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 09b0801..c533a2e 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -152,7 +152,7 @@ namespace OpenSim.Framework.Servers | |||
152 | { | 152 | { |
153 | m_log.Info("[STARTUP]: Beginning startup processing"); | 153 | m_log.Info("[STARTUP]: Beginning startup processing"); |
154 | 154 | ||
155 | m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine); | 155 | m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine); |
156 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | 156 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and |
157 | // the clr version number doesn't match the project version number under Mono. | 157 | // the clr version number doesn't match the project version number under Mono. |
158 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); | 158 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); |
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index 165b2b4..8d500bd 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim | |||
51 | 51 | ||
52 | public static string GetVersionString(string versionNumber, Flavour flavour) | 52 | public static string GetVersionString(string versionNumber, Flavour flavour) |
53 | { | 53 | { |
54 | string versionString = "Careminster " + versionNumber + " " + flavour; | 54 | string versionString = "OpenSimulator" + versionNumber + " " + flavour; |
55 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); | 55 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); |
56 | } | 56 | } |
57 | 57 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs index e01f649..f805863 100644 --- a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | |||
@@ -1,9 +1,29 @@ | |||
1 | /////////////////////////////////////////////////////////////////// | 1 | /* |
2 | // | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | // (c) Careminster LImited, Melanie Thielker and the Meta7 Team | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | // | 4 | * |
5 | // This file is not open source. All rights reserved | 5 | * Redistribution and use in source and binary forms, with or without |
6 | // Mod 2 | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
7 | 27 | ||
8 | using OpenSim.Region.Framework.Scenes; | 28 | using OpenSim.Region.Framework.Scenes; |
9 | 29 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs index d1a4d8e..ed26989 100644 --- a/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs | |||
@@ -1,9 +1,29 @@ | |||
1 | /////////////////////////////////////////////////////////////////// | 1 | /* |
2 | // | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | // (c) Careminster Limited, Melanie Thielker and the Meta7 Team | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | // | 4 | * |
5 | // This file is not open source. All rights reserved | 5 | * Redistribution and use in source and binary forms, with or without |
6 | // | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
7 | 27 | ||
8 | using OpenSim.Region.Framework.Scenes; | 28 | using OpenSim.Region.Framework.Scenes; |
9 | 29 | ||
diff --git a/OpenSim/Services/Interfaces/IAttachmentsService.cs b/OpenSim/Services/Interfaces/IAttachmentsService.cs index bdde369..7d33662 100644 --- a/OpenSim/Services/Interfaces/IAttachmentsService.cs +++ b/OpenSim/Services/Interfaces/IAttachmentsService.cs | |||
@@ -1,9 +1,30 @@ | |||
1 | //////////////////////////////////////////////////////////////// | 1 | /* |
2 | // | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | // (c) 2009, 2010 Careminster Limited and Melanie Thielker | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | // | 4 | * |
5 | // All rights reserved | 5 | * Redistribution and use in source and binary forms, with or without |
6 | // | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
7 | using System; | 28 | using System; |
8 | using Nini.Config; | 29 | using Nini.Config; |
9 | 30 | ||