From 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Sun, 25 May 2008 23:27:38 +0000
Subject: Update svn properties. Formatting cleanup.
---
.../Modules/World/Archiver/ArchiverModule.cs | 40 +++++++++++-----------
.../Modules/World/Archiver/IRegionArchiver.cs | 4 +--
.../Environment/Modules/World/Land/LandObject.cs | 6 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/World')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
index 27f16a7..7016d1b 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// This module loads and saves OpenSimulator archives
///
public class ArchiverModule : IRegionModule, IRegionArchiver
- {
+ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
///
@@ -47,51 +47,51 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
///
///
- private Scene m_scene;
-
+ private Scene m_scene;
+
public string Name { get { return "ArchiverModule"; } }
-
+
public bool IsSharedModule { get { return false; } }
-
+
public void Initialise(Scene scene, IConfigSource source)
{
m_scene = scene;
-
+
m_scene.RegisterModuleInterface(this);
}
-
+
public void PostInitialise()
- {
+ {
}
-
+
public void Close()
{
}
-
+
public void ArchiveRegion(string savePath)
{
m_log.Warn("[ARCHIVER]: Archive region not yet implemented");
-
+
List entities = m_scene.GetEntities();
-
+
foreach (EntityBase entity in entities)
{
-
+
}
-
- string serEntities = SerializeObjects(entities);
-
+
+ string serEntities = SerializeObjects(entities);
+
if (serEntities != null && serEntities.Length > 0)
{
m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count);
}
}
-
+
public void DearchiveRegion(string loadPath)
{
m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented");
}
-
+
///
/// Get an xml representation of the given scene objects.
///
@@ -115,8 +115,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
serialization += serObject;
serialization += "";
-
+
return serialization;
- }
+ }
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs
index 485cf02..b949666 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs
@@ -28,7 +28,7 @@
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Archiver
-{
+{
///
/// Interface to region archive functionality
///
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
///
void ArchiveRegion(string savePath);
-
+
///
/// Dearchive the given region archive into the scene
///
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 2f4f971..f5b1a1d 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -731,7 +731,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
if (obj.OwnerID == owners[i])
objlist.Add(obj);
}
- }
+ }
catch (InvalidOperationException)
{
m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr.");
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
landData.ownerPrims = 0;
landData.otherPrims = 0;
landData.selectedPrims = 0;
-
+
lock (primsOverMe)
primsOverMe.Clear();
@@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
public void addPrimToCount(SceneObjectGroup obj)
{
-
+
LLUUID prim_owner = obj.OwnerID;
int prim_count = obj.PrimCount;
--
cgit v1.1