OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -177,7 +177,7 @@ namespace OpenSim.Framework.Communications.Cache
public bool TryGetCachedAsset(UUID assetId, out AssetBase asset) public bool TryGetCachedAsset(UUID assetId, out AssetBase asset)
{ {
Object tmp; Object tmp;
if(m_memcache.TryGet(assetId, out tmp)) if (m_memcache.TryGet(assetId, out tmp))
{ {
asset = (AssetBase)tmp; asset = (AssetBase)tmp;
//m_log.Info("Retrieved from cache " + assetId); //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 // in the 2 caches differently. Also, locks are probably
// needed in all of this, or move to synchronized non // needed in all of this, or move to synchronized non
// generic forms for Dictionaries. // generic forms for Dictionaries.
if(m_memcache.Contains(uuid)) if (m_memcache.Contains(uuid))
{ {
m_memcache.Remove(uuid); m_memcache.Remove(uuid);
} }

2
OpenSim/Region/ClientStack/ClientStackManager.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment
} }
} catch (ReflectionTypeLoadException e) } catch (ReflectionTypeLoadException e)
{ {
foreach(Exception e2 in e.LoaderExceptions) foreach (Exception e2 in e.LoaderExceptions)
{ {
m_log.Error(e2.ToString()); m_log.Error(e2.ToString());
} }

11
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1826,11 +1826,12 @@ namespace OpenSim.Region.Environment.Scenes
{ {
//SceneObjectPart rootPart = group.GetChildPart(group.UUID); //SceneObjectPart rootPart = group.GetChildPart(group.UUID);
// Serialise calls to RemoveScriptInstances to avoid // Serialise calls to RemoveScriptInstances to avoid
// deadlocking on m_parts inside SceneObjectGroup // deadlocking on m_parts inside SceneObjectGroup
lock (m_deleting_scene_object) { lock (m_deleting_scene_object)
group.RemoveScriptInstances(); {
} group.RemoveScriptInstances();
}
foreach (SceneObjectPart part in group.Children.Values) foreach (SceneObjectPart part in group.Children.Values)
{ {