diff options
author | Jeff Ames | 2008-03-18 05:16:43 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-18 05:16:43 +0000 |
commit | 47180080f0f4b93c60232b47ca4e093bd7c73a1d (patch) | |
tree | 780f51135995bb4be311e6f2b331cfa5c4b16d9d /OpenSim/Region/Physics/Manager/CollisionLocker.cs | |
parent | Added copyright messages. Set svn:eol-style. Minor cleanup. (diff) | |
download | opensim-SC-47180080f0f4b93c60232b47ca4e093bd7c73a1d.zip opensim-SC-47180080f0f4b93c60232b47ca4e093bd7c73a1d.tar.gz opensim-SC-47180080f0f4b93c60232b47ca4e093bd7c73a1d.tar.bz2 opensim-SC-47180080f0f4b93c60232b47ca4e093bd7c73a1d.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/CollisionLocker.cs | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/Physics/Manager/CollisionLocker.cs b/OpenSim/Region/Physics/Manager/CollisionLocker.cs index 98e9736..f88554b 100644 --- a/OpenSim/Region/Physics/Manager/CollisionLocker.cs +++ b/OpenSim/Region/Physics/Manager/CollisionLocker.cs | |||
@@ -1,30 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, 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 OpenSim Project nor the | 12 | * * Neither the name of the OpenSim 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 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | */ |
27 | */ | ||
28 | 27 | ||
29 | using System; | 28 | using System; |
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
@@ -34,13 +33,13 @@ namespace OpenSim.Region.Physics.Manager | |||
34 | { | 33 | { |
35 | public class CollisionLocker | 34 | public class CollisionLocker |
36 | { | 35 | { |
37 | |||
38 | |||
39 | private List<IntPtr> worldlock = new List<IntPtr>(); | 36 | private List<IntPtr> worldlock = new List<IntPtr>(); |
37 | |||
40 | public CollisionLocker() | 38 | public CollisionLocker() |
41 | { | 39 | { |
42 | 40 | ||
43 | } | 41 | } |
42 | |||
44 | public void dlock(IntPtr world) | 43 | public void dlock(IntPtr world) |
45 | { | 44 | { |
46 | lock (worldlock) | 45 | lock (worldlock) |
@@ -49,6 +48,7 @@ namespace OpenSim.Region.Physics.Manager | |||
49 | } | 48 | } |
50 | 49 | ||
51 | } | 50 | } |
51 | |||
52 | public void dunlock(IntPtr world) | 52 | public void dunlock(IntPtr world) |
53 | { | 53 | { |
54 | lock (worldlock) | 54 | lock (worldlock) |
@@ -56,10 +56,12 @@ namespace OpenSim.Region.Physics.Manager | |||
56 | worldlock.Remove(world); | 56 | worldlock.Remove(world); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | |||
59 | public bool lockquery() | 60 | public bool lockquery() |
60 | { | 61 | { |
61 | return (worldlock.Count > 0); | 62 | return (worldlock.Count > 0); |
62 | } | 63 | } |
64 | |||
63 | public void drelease(IntPtr world) | 65 | public void drelease(IntPtr world) |
64 | { | 66 | { |
65 | lock (worldlock) | 67 | lock (worldlock) |
@@ -68,7 +70,5 @@ namespace OpenSim.Region.Physics.Manager | |||
68 | worldlock.Remove(world); | 70 | worldlock.Remove(world); |
69 | } | 71 | } |
70 | } | 72 | } |
71 | |||
72 | } | 73 | } |
73 | |||
74 | } | 74 | } |