aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-11-11 00:52:47 +0000
committerJeff Ames2008-11-11 00:52:47 +0000
commit5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa (patch)
tree2cba73fc21acdc7986233d5a540dd844b2df0870 /OpenSim
parent* Commit allows downloading of the .raw terrain from the estate tools. (diff)
downloadopensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.zip
opensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.tar.gz
opensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.tar.bz2
opensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientStackManager.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
3 files changed, 9 insertions, 8 deletions
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
177 public bool TryGetCachedAsset(UUID assetId, out AssetBase asset) 177 public bool TryGetCachedAsset(UUID assetId, out AssetBase asset)
178 { 178 {
179 Object tmp; 179 Object tmp;
180 if(m_memcache.TryGet(assetId, out tmp)) 180 if (m_memcache.TryGet(assetId, out tmp))
181 { 181 {
182 asset = (AssetBase)tmp; 182 asset = (AssetBase)tmp;
183 //m_log.Info("Retrieved from cache " + assetId); 183 //m_log.Info("Retrieved from cache " + assetId);
@@ -337,7 +337,7 @@ namespace OpenSim.Framework.Communications.Cache
337 // in the 2 caches differently. Also, locks are probably 337 // in the 2 caches differently. Also, locks are probably
338 // needed in all of this, or move to synchronized non 338 // needed in all of this, or move to synchronized non
339 // generic forms for Dictionaries. 339 // generic forms for Dictionaries.
340 if(m_memcache.Contains(uuid)) 340 if (m_memcache.Contains(uuid))
341 { 341 {
342 m_memcache.Remove(uuid); 342 m_memcache.Remove(uuid);
343 } 343 }
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
69 } 69 }
70 } catch (ReflectionTypeLoadException e) 70 } catch (ReflectionTypeLoadException e)
71 { 71 {
72 foreach(Exception e2 in e.LoaderExceptions) 72 foreach (Exception e2 in e.LoaderExceptions)
73 { 73 {
74 m_log.Error(e2.ToString()); 74 m_log.Error(e2.ToString());
75 } 75 }
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
1826 { 1826 {
1827 //SceneObjectPart rootPart = group.GetChildPart(group.UUID); 1827 //SceneObjectPart rootPart = group.GetChildPart(group.UUID);
1828 1828
1829 // Serialise calls to RemoveScriptInstances to avoid 1829 // Serialise calls to RemoveScriptInstances to avoid
1830 // deadlocking on m_parts inside SceneObjectGroup 1830 // deadlocking on m_parts inside SceneObjectGroup
1831 lock (m_deleting_scene_object) { 1831 lock (m_deleting_scene_object)
1832 group.RemoveScriptInstances(); 1832 {
1833 } 1833 group.RemoveScriptInstances();
1834 }
1834 1835
1835 foreach (SceneObjectPart part in group.Children.Values) 1836 foreach (SceneObjectPart part in group.Children.Values)
1836 { 1837 {