aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMike Mazur2009-02-16 02:29:00 +0000
committerMike Mazur2009-02-16 02:29:00 +0000
commit68ed72ee22cb30f2b88802c27eb95e9be8479ce6 (patch)
tree5cc0fdc5208e26cd90f20beed4ece2b58fab50d2
parent- add restrictions and error handling to plugin loading in (diff)
downloadopensim-SC_OLD-68ed72ee22cb30f2b88802c27eb95e9be8479ce6.zip
opensim-SC_OLD-68ed72ee22cb30f2b88802c27eb95e9be8479ce6.tar.gz
opensim-SC_OLD-68ed72ee22cb30f2b88802c27eb95e9be8479ce6.tar.bz2
opensim-SC_OLD-68ed72ee22cb30f2b88802c27eb95e9be8479ce6.tar.xz
- replace existing license header in each source file in
AssetInventoryServer with the standard OpenSim license header - add note about Cable Beach to CONTRIBUTORS.txt - clean up AssetInventoryServer.ini.example
Diffstat
-rw-r--r--CONTRIBUTORS.txt4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Interfaces.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Main.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleUtils.cs44
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Utils.cs44
-rw-r--r--bin/AssetInventoryServer.ini.example42
19 files changed, 378 insertions, 416 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e214720..b89d328 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -104,6 +104,10 @@ Testers
104* openlifegrid.com 104* openlifegrid.com
105 105
106 106
107AssetInventory Server and some plugins are based on Cable Beach
108Cable Beach is Copyright (c) 2008 Intel Corporation
109see http://forge.opensimulator.org/gf/project/assetserver/
110
107This software uses components from the following developers: 111This software uses components from the following developers:
108* Sleepycat Software (Berkeley DB) 112* Sleepycat Software (Berkeley DB)
109* DB4objects, Inc. (DB4o) 113* DB4objects, Inc. (DB4o)
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index 5e8a6f1..74e6ea4 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Interfaces.cs b/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
index 053cacf..b8c8f88 100644
--- a/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
index 89398f7..7392f1d 100644
--- a/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
+++ b/OpenSim/Grid/AssetInventoryServer/InventoryObjects.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Main.cs b/OpenSim/Grid/AssetInventoryServer/Main.cs
index 8f7d706..67aaf95 100644
--- a/OpenSim/Grid/AssetInventoryServer/Main.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Main.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
index 7fd1ee8..3d0a283 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
index 4ed8d87..6430e2a 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
index e958591..026b3c8 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
index 84e526a..30e22e5 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
index 887ab68..b05e523 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
index ad68c57..8fa8474 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
index 5e7f0c6..2ed6d59 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
index 1ead422..3778be7 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
index f411127..3db073d 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs
index 4e5526b..e7e898b 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs
index a48be2e..cab8700 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleUtils.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleUtils.cs
index 6a32718..0d5c53a 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleUtils.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleUtils.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/OpenSim/Grid/AssetInventoryServer/Utils.cs b/OpenSim/Grid/AssetInventoryServer/Utils.cs
index 01ca5a6..cc59051 100644
--- a/OpenSim/Grid/AssetInventoryServer/Utils.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Utils.cs
@@ -1,29 +1,27 @@
1/* 1/*
2 * Copyright (c) 2008 Intel Corporation 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * All rights reserved. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 4 *
8 * -- Redistributions of source code must retain the above copyright 5 * Redistribution and use in source and binary forms, with or without
9 * notice, this list of conditions and the following disclaimer. 6 * modification, are permitted provided that the following conditions are met:
10 * -- Redistributions in binary form must reproduce the above copyright 7 * * Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer.
12 * documentation and/or other materials provided with the distribution. 9 * * Redistributions in binary form must reproduce the above copyright
13 * -- Neither the name of the Intel Corporation nor the names of its 10 * notice, this list of conditions and the following disclaimer in the
14 * contributors may be used to endorse or promote products derived from 11 * documentation and/or other materials provided with the distribution.
15 * this software without specific prior written permission. 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.
16 * 15 *
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
21 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 26 */
29 27
diff --git a/bin/AssetInventoryServer.ini.example b/bin/AssetInventoryServer.ini.example
index 619495c..bba4668 100644
--- a/bin/AssetInventoryServer.ini.example
+++ b/bin/AssetInventoryServer.ini.example
@@ -9,16 +9,15 @@ listen_port = 8003
9; Asset Storage Provider 9; Asset Storage Provider
10;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
11 11
12; Simple storage is a very basic storage system for the purposes of illustrating 12; SimpleAssetStorage is a very basic storage system for the purposes of
13; a storage backend example. The assets are stored in SimpleAssets/ and 13; illustrating a storage backend example. The assets are stored in
14; TempAssets/ (which is deleted when the server shuts down). Metadata is 14; SimpleAssets/ and TempAssets/ (which is deleted when the server shuts down).
15; generated for all of the files at startup and when new assets are uploaded. 15; Metadata is generated for all of the files at startup and when new assets are
16; uploaded.
16;asset_storage_provider = SimpleAssetStorage 17;asset_storage_provider = SimpleAssetStorage
17 18
18; OpenSimMySQL storage connects to a MySQL server that has an assets table created 19; OpenSimAssetStorage connects to a database that has an assets table created
19; by OpenSim. Open the AssetServer_Config.xml file from OpenSim and use the 20; by OpenSim. This backend combined with the OpenSimFrontend will allow the asset
20; database connection string for the database_connect option in the MySQL section
21; below. This backend combined with the OpenSimFrontend will allow the asset
22; server to be used as a drop-in replacement for OpenSim.Grid.AssetServer.exe, 21; server to be used as a drop-in replacement for OpenSim.Grid.AssetServer.exe,
23; while also allowing other frontends to run. 22; while also allowing other frontends to run.
24asset_storage_provider = OpenSimAssetStorage 23asset_storage_provider = OpenSimAssetStorage
@@ -27,19 +26,17 @@ asset_storage_provider = OpenSimAssetStorage
27; Inventory Storage Provider 26; Inventory Storage Provider
28;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 27;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
29 28
30; Simple inventory is a very basic inventory storage system for the purposes of 29; SimpleInventoryStorage is a very basic inventory storage system for the
31; illustrating an inventory backend example. The inventory is stored in 30; purposes of illustrating an inventory backend example. The inventory is stored
32; SimpleInventory/ by creating a folder for each agent that contains all of the 31; in SimpleInventory/ by creating a folder for each agent that contains all of
33; inventory items and folders serialized as XML files. 32; the inventory items and folders serialized as XML files.
34;inventory_storage_provider = SimpleInventoryStorage 33;inventory_storage_provider = SimpleInventoryStorage
35 34
36; OpenSimMySQL inventory connects to a MySQL server that has an inventory table 35; OpenSimInventoryStorage connects to a database that has an inventory table
37; created by OpenSim. If the OpenSimMySQLStorage backend is also being used, the 36; created by OpenSim. This backend combined with the OpenSimInventoryFrontend
38; inventory and asset tables must be stored in the same database. The 37; will allow the server to be used as a drop-in replacement for
39; database_connect string in the MySQL section below is used to connect to the
40; database. This backend combined with the OpenSimInventoryFrontend will allow
41; the server to be used as a drop-in replacement for
42; OpenSim.Grid.InventoryServer.exe, while also allowing other frontends to run. 38; OpenSim.Grid.InventoryServer.exe, while also allowing other frontends to run.
39; *** NOTE: Inventory is not currently implemented.
43inventory_storage_provider = OpenSimInventoryStorage 40inventory_storage_provider = OpenSimInventoryStorage
44 41
45;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 42;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -95,9 +92,9 @@ metrics_provider = NullMetrics
95 92
96frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,BrowseFrontend 93frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,BrowseFrontend
97 94
95[OpenSim]
98; The OpenSim section applies to the OpenSim plugin (OpenSimAssetStorage, 96; The OpenSim section applies to the OpenSim plugin (OpenSimAssetStorage,
99; OpenSimInventoryStorage, OpenSimAssetFronend, OpenSimInventoryFrontend). 97; OpenSimInventoryStorage, OpenSimAssetFronend, OpenSimInventoryFrontend).
100[OpenSim]
101 98
102; The database provider determines which database to use. Any database backend 99; The database provider determines which database to use. Any database backend
103; supported by OpenSim is supported. 100; supported by OpenSim is supported.
@@ -109,12 +106,7 @@ inventory_database_provider = "OpenSim.Data.SQLite.dll"
109;inventory_database_provider = "OpenSim.Data.MySQL.dll" 106;inventory_database_provider = "OpenSim.Data.MySQL.dll"
110;inventory_database_provider = "OpenSim.Data.NHibernate.dll" 107;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
111 108
112; Database connection string used by the OpenSim MySQL backend. If these lines 109; Database connection string used by the database backend.
113; are commented out or missing, the server will look for an
114; AssetServer_Config.xml or InventoryServer_Config.xml file in the current
115; working directory. These files are generated by OpenSim.Grid.AssetServer.exe
116; and OpenSim.Grid.InventoryServer.exe, respectively, and can be used without
117; modification.
118 110
119; For SQLite 111; For SQLite
120asset_database_connect = "URI=file:Asset.db,version=3" 112asset_database_connect = "URI=file:Asset.db,version=3"
generated by cgit v1.1 at 2024-11-10 01:45:04 +0000