From de052c48d1d59bd77651288066c2350b136eca8b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 25 Nov 2008 16:10:08 +0000 Subject: [PATCH] Add copyright headers. Minor formatting cleanup. --- .../Framework/Communications/LoginService.cs | 2 +- .../Grid/MessagingServer/MessageService.cs | 10 ++--- OpenSim/Region/Application/HGOpenSimNode.cs | 27 +++++++++++ .../Communications/OGS1/OGS1UserServices.cs | 2 +- .../ContentManagementSystem/CMModel.cs | 2 +- .../Environment/Scenes/EntityManager.cs | 45 +++++++++++++++---- 6 files changed, 71 insertions(+), 17 deletions(-) diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index c3dcc9020e..d6d0e271e4 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -152,7 +152,7 @@ namespace OpenSim.Framework.Communications m_log.DebugFormat( "[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest); - if( !TryAuthenticateUser(request, firstname, lastname, out userProfile ) ) + if (!TryAuthenticateUser(request, firstname, lastname, out userProfile)) { return logResponse.CreateLoginFailedResponse(); } diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index a8ee9d51e6..7a4a47fad2 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs @@ -616,7 +616,7 @@ namespace OpenSim.Grid.MessagingServer Hashtable result = new Hashtable(); result["success"] = "FALSE"; - if(SendToUserServer(requestData, "region_startup")) + if (SendToUserServer(requestData, "region_startup")) result["success"] = "TRUE"; XmlRpcResponse response = new XmlRpcResponse(); @@ -630,7 +630,7 @@ namespace OpenSim.Grid.MessagingServer Hashtable result = new Hashtable(); result["success"] = "FALSE"; - if(SendToUserServer(requestData, "region_shutdown")) + if (SendToUserServer(requestData, "region_shutdown")) result["success"] = "TRUE"; XmlRpcResponse response = new XmlRpcResponse(); @@ -644,7 +644,7 @@ namespace OpenSim.Grid.MessagingServer Hashtable result = new Hashtable(); result["success"] = "FALSE"; - if(SendToUserServer(requestData, "agent_location")) + if (SendToUserServer(requestData, "agent_location")) result["success"] = "TRUE"; @@ -659,7 +659,7 @@ namespace OpenSim.Grid.MessagingServer Hashtable result = new Hashtable(); result["success"] = "FALSE"; - if(SendToUserServer(requestData, "agent_leaving")) + if (SendToUserServer(requestData, "agent_leaving")) result["success"] = "TRUE"; XmlRpcResponse response = new XmlRpcResponse(); @@ -681,7 +681,7 @@ namespace OpenSim.Grid.MessagingServer foreach (UserPresenceData up in m_presences.Values) { - if(up.regionData.UUID == regionID) + if (up.regionData.UUID == regionID) { if (up.OnlineYN) { diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index ef23adc822..7605bae47a 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs @@ -1,3 +1,30 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + using System; using System.Collections; using System.Collections.Generic; diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 5f39d8f104..af8d53eacc 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -776,7 +776,7 @@ namespace OpenSim.Region.Communications.OGS1 info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]); // accept missing id - if(respData.ContainsKey("regionID_" + i)) + if (respData.ContainsKey("regionID_" + i)) UUID.TryParse((string)respData["regionID_" + i], out info.regionID); } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs index 65fa9ba88a..02e77bb67f 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs @@ -274,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { scene.Entities.Clear(); - foreach(KeyValuePair kvp in ReplacementList) + foreach (KeyValuePair kvp in ReplacementList) { scene.Entities.Add(kvp.Value); } diff --git a/OpenSim/Region/Environment/Scenes/EntityManager.cs b/OpenSim/Region/Environment/Scenes/EntityManager.cs index eb29ead2bf..25f73b4b35 100644 --- a/OpenSim/Region/Environment/Scenes/EntityManager.cs +++ b/OpenSim/Region/Environment/Scenes/EntityManager.cs @@ -1,4 +1,31 @@ -using System; +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; using System.Collections; using System.Collections.Generic; using OpenMetaverse; @@ -19,7 +46,7 @@ namespace OpenSim.Region.Environment.Scenes public void Add(EntityBase entity) { - lock(m_lock) + lock (m_lock) { m_eb_uuid.Add(entity.UUID, entity); m_eb_localID.Add(entity.LocalId, entity); @@ -28,7 +55,7 @@ namespace OpenSim.Region.Environment.Scenes public void InsertOrReplace(EntityBase entity) { - lock(m_lock) + lock (m_lock) { m_eb_uuid[entity.UUID] = entity; m_eb_localID[entity.LocalId] = entity; @@ -57,7 +84,7 @@ namespace OpenSim.Region.Environment.Scenes public bool ContainsKey(UUID id) { - lock(m_lock) + lock (m_lock) { return m_eb_uuid.ContainsKey(id); } @@ -73,7 +100,7 @@ namespace OpenSim.Region.Environment.Scenes public bool Remove(uint localID) { - lock(m_lock) + lock (m_lock) { bool a = m_eb_uuid.Remove(m_eb_localID[localID].UUID); bool b = m_eb_localID.Remove(localID); @@ -84,7 +111,7 @@ namespace OpenSim.Region.Environment.Scenes public bool Remove(UUID id) { - lock(m_lock) + lock (m_lock) { bool a = m_eb_localID.Remove(m_eb_uuid[id].LocalId); bool b = m_eb_uuid.Remove(id); @@ -97,11 +124,11 @@ namespace OpenSim.Region.Environment.Scenes { List tmp = new List(); - lock(m_lock) + lock (m_lock) { foreach (KeyValuePair pair in m_eb_uuid) { - if(pair.Value is T) + if (pair.Value is T) { tmp.Add(pair.Value); } @@ -151,7 +178,7 @@ namespace OpenSim.Region.Environment.Scenes public bool TryGetValue(UUID key, out EntityBase obj) { - lock(m_lock) + lock (m_lock) { return m_eb_uuid.TryGetValue(key, out obj); }