2 files changed, 48 insertions, 48 deletions
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 @@
 /*
- * @brief AgentPreferences capability module
+ * Copyright (c) Contributors, http://opensimulator.org/
- * 
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- * Copyright (C) 2015, Cinder Roxley <cinder@sdf.org>
+ *
- * 
+ * Redistribution and use in source and binary forms, with or without
- * Permission is hereby granted, free of charge, to any person or organization
+ * modification, are permitted provided that the following conditions are met:
- * obtaining a copy of the software and accompanying documentation covered by
+ *     * Redistributions of source code must retain the above copyright
- * this license (the "Software") to use, reproduce, display, distribute,
+ *       notice, this list of conditions and the following disclaimer.
- * execute, and transmit the Software, and to prepare derivative works of the
+ *     * Redistributions in binary form must reproduce the above copyright
- * Software, and to permit third-parties to whom the Software is furnished to
+ *       notice, this list of conditions and the following disclaimer in the
- * do so, all subject to the following:
+ *       documentation and/or other materials provided with the distribution.
- * 
+ *     * Neither the name of the OpenSimulator Project nor the
- * The copyright notices in the Software and this entire statement, including
+ *       names of its contributors may be used to endorse or promote products
- * the above license grant, this restriction and the following disclaimer,
+ *       derived from this software without specific prior written permission.
- * must be included in all copies of the Software, in whole or in part, and
+ *
- * all derivative works of the Software, unless such copies or derivative
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * works are solely in the form of machine-executable object code generated by
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * a source language processor.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * 
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * DEALINGS IN THE SOFTWARE.
 */
 using 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 @@
 /*
- * Copyright (C) 2015, Cinder Roxley <cinder@sdf.org>
+ * Copyright (c) Contributors, http://opensimulator.org/
- * 
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- * Permission is hereby granted, free of charge, to any person or organization
+ *
- * obtaining a copy of the software and accompanying documentation covered by
+ * Redistribution and use in source and binary forms, with or without
- * this license (the "Software") to use, reproduce, display, distribute,
+ * modification, are permitted provided that the following conditions are met:
- * execute, and transmit the Software, and to prepare derivative works of the
+ *     * Redistributions of source code must retain the above copyright
- * Software, and to permit third-parties to whom the Software is furnished to
+ *       notice, this list of conditions and the following disclaimer.
- * do so, all subject to the following:
+ *     * Redistributions in binary form must reproduce the above copyright
- * 
+ *       notice, this list of conditions and the following disclaimer in the
- * The copyright notices in the Software and this entire statement, including
+ *       documentation and/or other materials provided with the distribution.
- * the above license grant, this restriction and the following disclaimer,
+ *     * Neither the name of the OpenSimulator Project nor the
- * must be included in all copies of the Software, in whole or in part, and
+ *       names of its contributors may be used to endorse or promote products
- * all derivative works of the Software, unless such copies or derivative
+ *       derived from this software without specific prior written permission.
- * works are solely in the form of machine-executable object code generated by
+ *
- * a source language processor.
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * DEALINGS IN THE SOFTWARE.
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 using 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
29	using System;	28	using 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
27	using System;	28	using System;