diff options
author | Jeff Ames | 2009-05-20 01:32:06 +0000 |
---|---|---|
committer | Jeff Ames | 2009-05-20 01:32:06 +0000 |
commit | e0bc5c5db2b88691c04b06be2fa73a75746126cb (patch) | |
tree | fa33ed724c57578d7ed76044f68940a4e09a8026 /OpenSim/Region | |
parent | Update svn properties. (diff) | |
download | opensim-SC-e0bc5c5db2b88691c04b06be2fa73a75746126cb.zip opensim-SC-e0bc5c5db2b88691c04b06be2fa73a75746126cb.tar.gz opensim-SC-e0bc5c5db2b88691c04b06be2fa73a75746126cb.tar.bz2 opensim-SC-e0bc5c5db2b88691c04b06be2fa73a75746126cb.tar.xz |
Add copyright headers, formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
6 files changed, 71 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index f6a326f..a52eb9a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -10708,7 +10708,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10708 | { | 10708 | { |
10709 | get | 10709 | get |
10710 | { | 10710 | { |
10711 | if(m_userEndPoint is IPEndPoint) | 10711 | if (m_userEndPoint is IPEndPoint) |
10712 | { | 10712 | { |
10713 | IPEndPoint ep = (IPEndPoint)m_userEndPoint; | 10713 | IPEndPoint ep = (IPEndPoint)m_userEndPoint; |
10714 | 10714 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 4a94814..c315c87 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | |||
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
189 | } | 189 | } |
190 | 190 | ||
191 | if (item.Sequence != 0) | 191 | if (item.Sequence != 0) |
192 | lock(contents) contents.Add(item.Sequence); | 192 | lock (contents) contents.Add(item.Sequence); |
193 | 193 | ||
194 | lock (this) | 194 | lock (this) |
195 | { | 195 | { |
@@ -241,7 +241,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
241 | item.TickCount = System.Environment.TickCount; | 241 | item.TickCount = System.Environment.TickCount; |
242 | if (item.Sequence == 0) | 242 | if (item.Sequence == 0) |
243 | return item; | 243 | return item; |
244 | lock(contents) | 244 | lock (contents) |
245 | { | 245 | { |
246 | if (contents.Contains(item.Sequence)) | 246 | if (contents.Contains(item.Sequence)) |
247 | if (contents.Remove(item.Sequence)) | 247 | if (contents.Remove(item.Sequence)) |
@@ -252,13 +252,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
252 | 252 | ||
253 | public void Cancel(uint sequence) | 253 | public void Cancel(uint sequence) |
254 | { | 254 | { |
255 | lock(contents) while (contents.Remove(sequence)) | 255 | lock (contents) while (contents.Remove(sequence)) |
256 | ; | 256 | ; |
257 | } | 257 | } |
258 | 258 | ||
259 | public bool Contains(uint sequence) | 259 | public bool Contains(uint sequence) |
260 | { | 260 | { |
261 | lock(contents) return contents.Contains(sequence); | 261 | lock (contents) return contents.Contains(sequence); |
262 | } | 262 | } |
263 | 263 | ||
264 | public void Flush() | 264 | public void Flush() |
@@ -318,7 +318,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
318 | TextureOutgoingPacketQueue.Clear(); | 318 | TextureOutgoingPacketQueue.Clear(); |
319 | AssetOutgoingPacketQueue.Clear(); | 319 | AssetOutgoingPacketQueue.Clear(); |
320 | SendQueue.Clear(); | 320 | SendQueue.Clear(); |
321 | lock(contents) contents.Clear(); | 321 | lock (contents) contents.Clear(); |
322 | } | 322 | } |
323 | } | 323 | } |
324 | 324 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index f6da1e4..3067d75 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -395,7 +395,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
395 | return regionInfo; | 395 | return regionInfo; |
396 | } | 396 | } |
397 | 397 | ||
398 | if((!m_useRemoteRegionCache) || (!m_remoteRegionInfoCache.TryGetValue(regionHandle, out regionInfo))) | 398 | if ((!m_useRemoteRegionCache) || (!m_remoteRegionInfoCache.TryGetValue(regionHandle, out regionInfo))) |
399 | { | 399 | { |
400 | try | 400 | try |
401 | { | 401 | { |
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs index 28e0382..bfe2a71 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using 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 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.IO; | 30 | using System.IO; |
4 | using System.Text; | 31 | using System.Text; |
@@ -19,11 +46,11 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
19 | { | 46 | { |
20 | new SceneBanner(scene, m_bans); | 47 | new SceneBanner(scene, m_bans); |
21 | 48 | ||
22 | lock(m_bans) | 49 | lock (m_bans) |
23 | { | 50 | { |
24 | foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans) | 51 | foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans) |
25 | { | 52 | { |
26 | if(!String.IsNullOrEmpty(ban.BannedHostIPMask)) | 53 | if (!String.IsNullOrEmpty(ban.BannedHostIPMask)) |
27 | m_bans.Add(ban.BannedHostIPMask); | 54 | m_bans.Add(ban.BannedHostIPMask); |
28 | if (!String.IsNullOrEmpty(ban.BannedHostNameMask)) | 55 | if (!String.IsNullOrEmpty(ban.BannedHostNameMask)) |
29 | m_bans.Add(ban.BannedHostNameMask); | 56 | m_bans.Add(ban.BannedHostNameMask); |
@@ -33,7 +60,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
33 | 60 | ||
34 | public void PostInitialise() | 61 | public void PostInitialise() |
35 | { | 62 | { |
36 | if(File.Exists("bans.txt")) | 63 | if (File.Exists("bans.txt")) |
37 | { | 64 | { |
38 | string[] bans = File.ReadAllLines("bans.txt"); | 65 | string[] bans = File.ReadAllLines("bans.txt"); |
39 | foreach (string ban in bans) | 66 | foreach (string ban in bans) |
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs index a5e9963..dbfcfee 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System.Collections.Generic; | 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 | |||
28 | using System.Collections.Generic; | ||
2 | using System.Net; | 29 | using System.Net; |
3 | using OpenSim.Framework.Client; | 30 | using OpenSim.Framework.Client; |
4 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
@@ -23,7 +50,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
23 | void EventManager_OnClientConnect(IClientCore client) | 50 | void EventManager_OnClientConnect(IClientCore client) |
24 | { | 51 | { |
25 | IClientIPEndpoint ipEndpoint; | 52 | IClientIPEndpoint ipEndpoint; |
26 | if(client.TryGet(out ipEndpoint)) | 53 | if (client.TryGet(out ipEndpoint)) |
27 | { | 54 | { |
28 | IPAddress end = ipEndpoint.EndPoint; | 55 | IPAddress end = ipEndpoint.EndPoint; |
29 | 56 | ||
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index e808cb2..a3bcd5f 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -183,11 +183,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
183 | 183 | ||
184 | public void ScriptRemoved(UUID itemID) | 184 | public void ScriptRemoved(UUID itemID) |
185 | { | 185 | { |
186 | lock(m_UrlMap) | 186 | lock (m_UrlMap) |
187 | { | 187 | { |
188 | List<string> removeURLs = new List<string>(); | 188 | List<string> removeURLs = new List<string>(); |
189 | 189 | ||
190 | foreach(KeyValuePair<string, UrlData> url in m_UrlMap) | 190 | foreach (KeyValuePair<string, UrlData> url in m_UrlMap) |
191 | { | 191 | { |
192 | if (url.Value.itemID == itemID) | 192 | if (url.Value.itemID == itemID) |
193 | { | 193 | { |
@@ -205,11 +205,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
205 | 205 | ||
206 | public void ObjectRemoved(UUID objectID) | 206 | public void ObjectRemoved(UUID objectID) |
207 | { | 207 | { |
208 | lock(m_UrlMap) | 208 | lock (m_UrlMap) |
209 | { | 209 | { |
210 | List<string> removeURLs = new List<string>(); | 210 | List<string> removeURLs = new List<string>(); |
211 | 211 | ||
212 | foreach(KeyValuePair<string, UrlData> url in m_UrlMap) | 212 | foreach (KeyValuePair<string, UrlData> url in m_UrlMap) |
213 | { | 213 | { |
214 | if (url.Value.hostID == objectID) | 214 | if (url.Value.hostID == objectID) |
215 | { | 215 | { |