aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS.txt18
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs50
2 files changed, 35 insertions, 33 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index c48ede5..a369a75 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -13,7 +13,7 @@ people that make the day to day of OpenSim happen.
13* lbsa71 (Tribal Media AB) 13* lbsa71 (Tribal Media AB)
14* Sean Dague / sdague (IBM) 14* Sean Dague / sdague (IBM)
15* Tedd 15* Tedd
16* justincc (Black Dress Technology) 16* justincc
17* Teravus (w3z) 17* Teravus (w3z)
18* Johan Berntsson (3Di) 18* Johan Berntsson (3Di)
19* Ckrinke (Charles Krinke) 19* Ckrinke (Charles Krinke)
@@ -29,6 +29,7 @@ people that make the day to day of OpenSim happen.
29* nlin (3Di) 29* nlin (3Di)
30* Arthur Rodrigo S Valadares (IBM) 30* Arthur Rodrigo S Valadares (IBM)
31 31
32
32= Past Open Sim Developers = 33= Past Open Sim Developers =
33These folks are alumns of the OpenSim core group, but are now 34These folks are alumns of the OpenSim core group, but are now
34currently not active. Their great contributions helped get us to 35currently not active. Their great contributions helped get us to
@@ -44,6 +45,7 @@ where we are today.
44* Darok 45* Darok
45* Alondria 46* Alondria
46 47
48
47= Additional OpenSim Contributors = 49= Additional OpenSim Contributors =
48These folks have contributed code patches to OpenSim to help make it 50These folks have contributed code patches to OpenSim to help make it
49what it is today. 51what it is today.
@@ -90,6 +92,7 @@ what it is today.
90* maimedleech 92* maimedleech
91* Mic Bowman 93* Mic Bowman
92* Michelle Argus 94* Michelle Argus
95* Michael Cortez (The Flotsam Project, http://osflotsam.org/)
93* Mike Osias (IBM) 96* Mike Osias (IBM)
94* Mike Pitman (IBM) 97* Mike Pitman (IBM)
95* mikkopa/_someone - RealXtend 98* mikkopa/_someone - RealXtend
@@ -123,8 +126,7 @@ what it is today.
123* Zha Ewry 126* Zha Ewry
124 127
125 128
126 129= LSL Devs =
127LSL Devs
128 130
129* Alondria 131* Alondria
130* CharlieO 132* CharlieO
@@ -132,7 +134,7 @@ LSL Devs
132* Melanie Thielker 134* Melanie Thielker
133 135
134 136
135Testers 137= Testers =
136 138
137* Ai Austin 139* Ai Austin
138* CharlieO (LSL) 140* CharlieO (LSL)
@@ -140,10 +142,6 @@ Testers
140* openlifegrid.com 142* openlifegrid.com
141 143
142 144
143AssetInventory Server and some plugins are based on Cable Beach
144Cable Beach is Copyright (c) 2008 Intel Corporation
145see http://forge.opensimulator.org/gf/project/assetserver/
146
147This software uses components from the following developers: 145This software uses components from the following developers:
148* Sleepycat Software (Berkeley DB) 146* Sleepycat Software (Berkeley DB)
149* SQLite (Public Domain) 147* SQLite (Public Domain)
@@ -161,6 +159,10 @@ This software uses components from the following developers:
161* log4net (http://logging.apache.org/log4net/) 159* log4net (http://logging.apache.org/log4net/)
162* GlynnTucker.Cache (http://gtcache.sourceforge.net/) 160* GlynnTucker.Cache (http://gtcache.sourceforge.net/)
163 161
162Some plugins are based on Cable Beach
163Cable Beach is Copyright (c) 2008 Intel Corporation
164see http://forge.opensimulator.org/gf/project/assetserver/
165
164In addition, we would like to thank: 166In addition, we would like to thank:
165* The Mono Project 167* The Mono Project
166* The NANT Developers 168* The NANT Developers
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index c91b63e..53b8ebc 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -1,29 +1,29 @@
1/* 1/*
2Copyright (c) Contributors, http://osflotsam.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 4 *
5Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * Neither the name of the Flotsam Project nor the 12 * * Neither the name of the OpenSimulator Project nor the
13 names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 15 *
16THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ 26 */
27 27
28// Uncomment to make asset Get requests for existing 28// Uncomment to make asset Get requests for existing
29// #define WAIT_ON_INPROGRESS_REQUESTS 29// #define WAIT_ON_INPROGRESS_REQUESTS