aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCinder2015-06-05 18:13:42 -0600
committerDiva Canto2015-06-13 07:27:26 -0700
commitc1ddb7f05e337a65c9505ea714879038b9a215d4 (patch)
tree9751cde7ee0c533afe0d960bc3a962149d806e43
parentSupport for Linden AgentPreferences capability and friends (UpdateAgentLangua... (diff)
downloadopensim-SC_OLD-c1ddb7f05e337a65c9505ea714879038b9a215d4.zip
opensim-SC_OLD-c1ddb7f05e337a65c9505ea714879038b9a215d4.tar.gz
opensim-SC_OLD-c1ddb7f05e337a65c9505ea714879038b9a215d4.tar.bz2
opensim-SC_OLD-c1ddb7f05e337a65c9505ea714879038b9a215d4.tar.xz
Relicense AgentPreferences files to BSD and OpenSimulator
Signed-off-by: Diva Canto <diva@metaverseink.com>
-rw-r--r--OpenSim/Data/IAgentPreferencesData.cs49
-rw-r--r--OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs47
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs49
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAgentPreferencesModule.cs47
4 files changed, 96 insertions, 96 deletions
diff --git a/OpenSim/Data/IAgentPreferencesData.cs b/OpenSim/Data/IAgentPreferencesData.cs
index 18bf337..f8261e2 100644
--- a/OpenSim/Data/IAgentPreferencesData.cs
+++ b/OpenSim/Data/IAgentPreferencesData.cs
@@ -1,29 +1,28 @@
1/* 1/*
2 * @brief Data store for AgentPreferences capability 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Copyright (C) 2015, Cinder Roxley <cinder@sdf.org> 4 *
5 * 5 * Redistribution and use in source and binary forms, with or without
6 * Permission is hereby granted, free of charge, to any person or organization 6 * modification, are permitted provided that the following conditions are met:
7 * obtaining a copy of the software and accompanying documentation covered by 7 * * Redistributions of source code must retain the above copyright
8 * this license (the "Software") to use, reproduce, display, distribute, 8 * notice, this list of conditions and the following disclaimer.
9 * execute, and transmit the Software, and to prepare derivative works of the 9 * * Redistributions in binary form must reproduce the above copyright
10 * Software, and to permit third-parties to whom the Software is furnished to 10 * notice, this list of conditions and the following disclaimer in the
11 * do so, all subject to the following: 11 * documentation and/or other materials provided with the distribution.
12 * 12 * * Neither the name of the OpenSimulator Project nor the
13 * The copyright notices in the Software and this entire statement, including 13 * names of its contributors may be used to endorse or promote products
14 * the above license grant, this restriction and the following disclaimer, 14 * derived from this software without specific prior written permission.
15 * must be included in all copies of the Software, in whole or in part, and 15 *
16 * all derivative works of the Software, unless such copies or derivative 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * works are solely in the form of machine-executable object code generated by 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * a source language processor. 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * DEALINGS IN THE SOFTWARE.
27 */ 26 */
28 27
29using System; 28using System;
diff --git a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
index 0ea2f64..cd9004a 100644
--- a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
+++ b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
@@ -1,27 +1,28 @@
1/* 1/*
2 * Copyright (C) 2015, Cinder Roxley <cinder@sdf.org> 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Permission is hereby granted, free of charge, to any person or organization 4 *
5 * obtaining a copy of the software and accompanying documentation covered by 5 * Redistribution and use in source and binary forms, with or without
6 * this license (the "Software") to use, reproduce, display, distribute, 6 * modification, are permitted provided that the following conditions are met:
7 * execute, and transmit the Software, and to prepare derivative works of the 7 * * Redistributions of source code must retain the above copyright
8 * Software, and to permit third-parties to whom the Software is furnished to 8 * notice, this list of conditions and the following disclaimer.
9 * do so, all subject to the following: 9 * * Redistributions in binary form must reproduce the above copyright
10 * 10 * notice, this list of conditions and the following disclaimer in the
11 * The copyright notices in the Software and this entire statement, including 11 * documentation and/or other materials provided with the distribution.
12 * the above license grant, this restriction and the following disclaimer, 12 * * Neither the name of the OpenSimulator Project nor the
13 * must be included in all copies of the Software, in whole or in part, and 13 * names of its contributors may be used to endorse or promote products
14 * all derivative works of the Software, unless such copies or derivative 14 * derived from this software without specific prior written permission.
15 * works are solely in the form of machine-executable object code generated by 15 *
16 * a source language processor. 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * DEALINGS IN THE SOFTWARE. 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.
25 */ 26 */
26 27
27using System; 28using System;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
index a738fba..58d9f7d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
@@ -1,29 +1,28 @@
1/* 1/*
2 * @brief AgentPreferences capability module 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Copyright (C) 2015, Cinder Roxley <cinder@sdf.org> 4 *
5 * 5 * Redistribution and use in source and binary forms, with or without
6 * Permission is hereby granted, free of charge, to any person or organization 6 * modification, are permitted provided that the following conditions are met:
7 * obtaining a copy of the software and accompanying documentation covered by 7 * * Redistributions of source code must retain the above copyright
8 * this license (the "Software") to use, reproduce, display, distribute, 8 * notice, this list of conditions and the following disclaimer.
9 * execute, and transmit the Software, and to prepare derivative works of the 9 * * Redistributions in binary form must reproduce the above copyright
10 * Software, and to permit third-parties to whom the Software is furnished to 10 * notice, this list of conditions and the following disclaimer in the
11 * do so, all subject to the following: 11 * documentation and/or other materials provided with the distribution.
12 * 12 * * Neither the name of the OpenSimulator Project nor the
13 * The copyright notices in the Software and this entire statement, including 13 * names of its contributors may be used to endorse or promote products
14 * the above license grant, this restriction and the following disclaimer, 14 * derived from this software without specific prior written permission.
15 * must be included in all copies of the Software, in whole or in part, and 15 *
16 * all derivative works of the Software, unless such copies or derivative 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * works are solely in the form of machine-executable object code generated by 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * a source language processor. 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * DEALINGS IN THE SOFTWARE.
27 */ 26 */
28 27
29using System; 28using System;
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentPreferencesModule.cs b/OpenSim/Region/Framework/Interfaces/IAgentPreferencesModule.cs
index f2930ac..4975b96 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentPreferencesModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentPreferencesModule.cs
@@ -1,27 +1,28 @@
1/* 1/*
2 * Copyright (C) 2015, Cinder Roxley <cinder@sdf.org> 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Permission is hereby granted, free of charge, to any person or organization 4 *
5 * obtaining a copy of the software and accompanying documentation covered by 5 * Redistribution and use in source and binary forms, with or without
6 * this license (the "Software") to use, reproduce, display, distribute, 6 * modification, are permitted provided that the following conditions are met:
7 * execute, and transmit the Software, and to prepare derivative works of the 7 * * Redistributions of source code must retain the above copyright
8 * Software, and to permit third-parties to whom the Software is furnished to 8 * notice, this list of conditions and the following disclaimer.
9 * do so, all subject to the following: 9 * * Redistributions in binary form must reproduce the above copyright
10 * 10 * notice, this list of conditions and the following disclaimer in the
11 * The copyright notices in the Software and this entire statement, including 11 * documentation and/or other materials provided with the distribution.
12 * the above license grant, this restriction and the following disclaimer, 12 * * Neither the name of the OpenSimulator Project nor the
13 * must be included in all copies of the Software, in whole or in part, and 13 * names of its contributors may be used to endorse or promote products
14 * all derivative works of the Software, unless such copies or derivative 14 * derived from this software without specific prior written permission.
15 * works are solely in the form of machine-executable object code generated by 15 *
16 * a source language processor. 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * DEALINGS IN THE SOFTWARE. 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.
25 */ 26 */
26 27
27using System; 28using System;