From 5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 11 Nov 2008 00:52:47 +0000 Subject: Update svn properties, minor formatting cleanup. --- OpenSim/Framework/Communications/Cache/AssetCache.cs | 4 ++-- OpenSim/Region/ClientStack/ClientStackManager.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.cs | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 9ec5a98..d988032 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -177,7 +177,7 @@ namespace OpenSim.Framework.Communications.Cache public bool TryGetCachedAsset(UUID assetId, out AssetBase asset) { Object tmp; - if(m_memcache.TryGet(assetId, out tmp)) + if (m_memcache.TryGet(assetId, out tmp)) { asset = (AssetBase)tmp; //m_log.Info("Retrieved from cache " + assetId); @@ -337,7 +337,7 @@ namespace OpenSim.Framework.Communications.Cache // in the 2 caches differently. Also, locks are probably // needed in all of this, or move to synchronized non // generic forms for Dictionaries. - if(m_memcache.Contains(uuid)) + if (m_memcache.Contains(uuid)) { m_memcache.Remove(uuid); } diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs index 098466d..6bc4c4b 100644 --- a/OpenSim/Region/ClientStack/ClientStackManager.cs +++ b/OpenSim/Region/ClientStack/ClientStackManager.cs @@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment } } catch (ReflectionTypeLoadException e) { - foreach(Exception e2 in e.LoaderExceptions) + foreach (Exception e2 in e.LoaderExceptions) { m_log.Error(e2.ToString()); } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7de6fd1..f686a9f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1826,11 +1826,12 @@ namespace OpenSim.Region.Environment.Scenes { //SceneObjectPart rootPart = group.GetChildPart(group.UUID); - // Serialise calls to RemoveScriptInstances to avoid - // deadlocking on m_parts inside SceneObjectGroup - lock (m_deleting_scene_object) { - group.RemoveScriptInstances(); - } + // Serialise calls to RemoveScriptInstances to avoid + // deadlocking on m_parts inside SceneObjectGroup + lock (m_deleting_scene_object) + { + group.RemoveScriptInstances(); + } foreach (SceneObjectPart part in group.Children.Values) { -- cgit v1.1