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

Update svn properties, formatting cleanup.

0.6.0-stable
Jeff Ames 2008-09-09 01:26:48 +00:00
parent 3e1441afe1
commit fae34bb10c
41 changed files with 838 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
View File

@ -102,11 +102,15 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
private void SetupSerialiser() private void SetupSerialiser()
{ {
if (m_serialiser.Count == 0) if (m_serialiser.Count == 0)
{
foreach (UUID region in m_scenes.Keys) foreach (UUID region in m_scenes.Keys)
{
m_serialiser.Add(region, m_serialiser.Add(region,
m_scenes[region].RequestModuleInterface<IRegionSerialiser>() m_scenes[region].RequestModuleInterface<IRegionSerialiser>()
); );
} }
}
}
#endregion Private Methods #endregion Private Methods
@ -177,7 +181,6 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
XmlNode rootNode; XmlNode rootNode;
m_log.Info("[FSDB]: Checking if " + filename + " exists."); m_log.Info("[FSDB]: Checking if " + filename + " exists.");
if (File.Exists(filename)) if (File.Exists(filename))
{ {
@ -191,7 +194,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
rootNode = doc.FirstChild; rootNode = doc.FirstChild;
foreach (XmlNode aPrimNode in rootNode.ChildNodes) foreach (XmlNode aPrimNode in rootNode.ChildNodes)
{
xmlList.Add(aPrimNode.OuterXml); xmlList.Add(aPrimNode.OuterXml);
}
x.Stop(); x.Stop();
TimeToDownload += x.ElapsedMilliseconds; TimeToDownload += x.ElapsedMilliseconds;
@ -226,7 +231,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
String logLocation = ""; String logLocation = "";
foreach (string revisionDir in directories) foreach (string revisionDir in directories)
{ {
try { try
{
logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; logLocation = revisionDir + Slash.DirectorySeparatorChar + "log";
fs = new FileStream( logLocation, FileMode.Open); fs = new FileStream( logLocation, FileMode.Open);
sr = new StreamReader(fs); sr = new StreamReader(fs);
@ -236,7 +242,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
revisionDict.Add(revisionDir, logMessage); revisionDict.Add(revisionDir, logMessage);
} }
catch (Exception) catch (Exception)
{} {
}
} }
return revisionDict; return revisionDict;