Update svn properties, minor formatting cleanup.

0.6.1-post-fixes
Jeff Ames 2008-11-11 00:52:47 +00:00
parent d145700115
commit 5276c4bdf8
4 changed files with 486 additions and 485 deletions

View File

@ -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);
}

View File

@ -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());
}

View File

@ -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)
{