aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Tests/ACLTest.cs
diff options
context:
space:
mode:
authorMelanie2009-11-23 04:24:58 +0000
committerMelanie2009-11-23 04:24:58 +0000
commitdf121a7cd065cc067818f6a39a44ddaaab647fec (patch)
tree5cc0e157ff3aefad066c07a1ebea2ae4b1ebdbe4 /OpenSim/Framework/Tests/ACLTest.cs
parentMerge branch 'master' into careminster (diff)
parent* Adds a modicum of additional checking to the Inventory Service (MySQL only) (diff)
downloadopensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.zip
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.gz
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.bz2
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Tests/ACLTest.cs')
-rw-r--r--OpenSim/Framework/Tests/ACLTest.cs29
1 files changed, 28 insertions, 1 deletions
diff --git a/OpenSim/Framework/Tests/ACLTest.cs b/OpenSim/Framework/Tests/ACLTest.cs
index d11f307..06e860e 100644
--- a/OpenSim/Framework/Tests/ACLTest.cs
+++ b/OpenSim/Framework/Tests/ACLTest.cs
@@ -1,4 +1,31 @@
1using System; 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
2using NUnit.Framework; 29using NUnit.Framework;
3using System.Collections.Generic; 30using System.Collections.Generic;
4 31