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

* Various compiler warning cleanups.

0.6.0-stable
Adam Frisby 2008-04-21 13:16:00 +00:00
parent bf1580fba4
commit 0d27832d44
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
foreach (Scene mscene in m_localScenes) foreach (Scene mscene in m_localScenes)
{ {
if((mscene.RegionInfo.InternalEndPoint.Address.Equals(ipEndPoint.Address.Address)) && if((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) &&
(mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port)) (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port))
{ {
scene = mscene; scene = mscene;

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -365,7 +365,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
} }
catch (XmlException e) catch (XmlException)
{ {
m_log.ErrorFormat("[SCENE OBJECT GROUP]: Deserialization of following xml failed, {0}", xmlData); m_log.ErrorFormat("[SCENE OBJECT GROUP]: Deserialization of following xml failed, {0}", xmlData);

22
OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
View File

@ -18,10 +18,11 @@ namespace OpenSim.Region.Modules.SvnSerialiser
public class SvnBackupModule : IRegionModule public class SvnBackupModule : IRegionModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly List<Scene> m_scenes = new List<Scene>();
private readonly Timer m_timer = new Timer();
private bool m_enabled = false; private bool m_enabled = false;
private bool m_installBackupOnLoad = false; private bool m_installBackupOnLoad = false;
private List<Scene> m_scenes = new List<Scene>();
private IRegionSerialiser m_serialiser; private IRegionSerialiser m_serialiser;
private bool m_svnAutoSave = false; private bool m_svnAutoSave = false;
private SvnClient m_svnClient; private SvnClient m_svnClient;
@ -31,7 +32,6 @@ namespace OpenSim.Region.Modules.SvnSerialiser
private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0); private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0);
private string m_svnurl = "svn://insert.your.svn/here/"; private string m_svnurl = "svn://insert.your.svn/here/";
private string m_svnuser = "username"; private string m_svnuser = "username";
private Timer m_timer = new Timer();
#region SvnModule Core #region SvnModule Core
@ -69,11 +69,11 @@ namespace OpenSim.Region.Modules.SvnSerialiser
{ {
m_log.Info("[SVNBACKUP]: Saving a region to SVN with name " + scene.RegionInfo.RegionName); m_log.Info("[SVNBACKUP]: Saving a region to SVN with name " + scene.RegionInfo.RegionName);
List<string> filenames = m_serialiser.SerialiseRegion(scene, m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() + "\\"); List<string> filenames = m_serialiser.SerialiseRegion(scene, m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + "\\");
try try
{ {
m_svnClient.Add3(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString(), true, false, false); m_svnClient.Add3(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID, true, false, false);
} }
catch (SvnException) catch (SvnException)
{ {
@ -81,17 +81,17 @@ namespace OpenSim.Region.Modules.SvnSerialiser
List<string> svnfilenames = new List<string>(); List<string> svnfilenames = new List<string>();
foreach (string filename in filenames) foreach (string filename in filenames)
svnfilenames.Add(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() + Slash.DirectorySeparatorChar + filename); svnfilenames.Add(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + Slash.DirectorySeparatorChar + filename);
svnfilenames.Add(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString()); svnfilenames.Add(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID);
return svnfilenames; return svnfilenames;
} }
public void LoadRegion(Scene scene) public void LoadRegion(Scene scene)
{ {
scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() + scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
Slash.DirectorySeparatorChar + "objects.xml"); Slash.DirectorySeparatorChar + "objects.xml");
scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() + scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
Slash.DirectorySeparatorChar + "heightmap.r32"); Slash.DirectorySeparatorChar + "heightmap.r32");
m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ").");
} }
@ -146,7 +146,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
} }
} }
string msg = "Region Backup (" + System.Environment.MachineName + " at " + DateTime.UtcNow.ToString() + " UTC)"; string msg = "Region Backup (" + System.Environment.MachineName + " at " + DateTime.UtcNow + " UTC)";
m_log.Debug("[SVNBACKUP]: Saved with message: " + msg); m_log.Debug("[SVNBACKUP]: Saved with message: " + msg);
@ -194,10 +194,10 @@ namespace OpenSim.Region.Modules.SvnSerialiser
if (m_enabled == false) if (m_enabled == false)
return; return;
if (m_svnAutoSave == true) if (m_svnAutoSave)
{ {
m_timer.Interval = m_svnperiod.TotalMilliseconds; m_timer.Interval = m_svnperiod.TotalMilliseconds;
m_timer.Elapsed += new ElapsedEventHandler(m_timer_Elapsed); m_timer.Elapsed += m_timer_Elapsed;
m_timer.AutoReset = true; m_timer.AutoReset = true;
m_timer.Start(); m_timer.Start();
} }