diff options
author | Jeff Ames | 2008-05-25 23:27:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-25 23:27:38 +0000 |
commit | 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch) | |
tree | b010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region/Environment/Modules/World | |
parent | * A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff) | |
download | opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2 opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
3 files changed, 25 insertions, 25 deletions
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 | |||
39 | /// This module loads and saves OpenSimulator archives | 39 | /// This module loads and saves OpenSimulator archives |
40 | /// </summary> | 40 | /// </summary> |
41 | public class ArchiverModule : IRegionModule, IRegionArchiver | 41 | public class ArchiverModule : IRegionModule, IRegionArchiver |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
@@ -47,51 +47,51 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="scene"></param> | 48 | /// <param name="scene"></param> |
49 | /// <param name="source"></param> | 49 | /// <param name="source"></param> |
50 | private Scene m_scene; | 50 | private Scene m_scene; |
51 | 51 | ||
52 | public string Name { get { return "ArchiverModule"; } } | 52 | public string Name { get { return "ArchiverModule"; } } |
53 | 53 | ||
54 | public bool IsSharedModule { get { return false; } } | 54 | public bool IsSharedModule { get { return false; } } |
55 | 55 | ||
56 | public void Initialise(Scene scene, IConfigSource source) | 56 | public void Initialise(Scene scene, IConfigSource source) |
57 | { | 57 | { |
58 | m_scene = scene; | 58 | m_scene = scene; |
59 | 59 | ||
60 | m_scene.RegisterModuleInterface<IRegionArchiver>(this); | 60 | m_scene.RegisterModuleInterface<IRegionArchiver>(this); |
61 | } | 61 | } |
62 | 62 | ||
63 | public void PostInitialise() | 63 | public void PostInitialise() |
64 | { | 64 | { |
65 | } | 65 | } |
66 | 66 | ||
67 | public void Close() | 67 | public void Close() |
68 | { | 68 | { |
69 | } | 69 | } |
70 | 70 | ||
71 | public void ArchiveRegion(string savePath) | 71 | public void ArchiveRegion(string savePath) |
72 | { | 72 | { |
73 | m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); | 73 | m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); |
74 | 74 | ||
75 | List<EntityBase> entities = m_scene.GetEntities(); | 75 | List<EntityBase> entities = m_scene.GetEntities(); |
76 | 76 | ||
77 | foreach (EntityBase entity in entities) | 77 | foreach (EntityBase entity in entities) |
78 | { | 78 | { |
79 | 79 | ||
80 | } | 80 | } |
81 | 81 | ||
82 | string serEntities = SerializeObjects(entities); | 82 | string serEntities = SerializeObjects(entities); |
83 | 83 | ||
84 | if (serEntities != null && serEntities.Length > 0) | 84 | if (serEntities != null && serEntities.Length > 0) |
85 | { | 85 | { |
86 | m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); | 86 | m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||
90 | public void DearchiveRegion(string loadPath) | 90 | public void DearchiveRegion(string loadPath) |
91 | { | 91 | { |
92 | m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented"); | 92 | m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented"); |
93 | } | 93 | } |
94 | 94 | ||
95 | /// <summary> | 95 | /// <summary> |
96 | /// Get an xml representation of the given scene objects. | 96 | /// Get an xml representation of the given scene objects. |
97 | /// </summary> | 97 | /// </summary> |
@@ -115,8 +115,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
115 | serialization += serObject; | 115 | serialization += serObject; |
116 | 116 | ||
117 | serialization += "</scene>"; | 117 | serialization += "</scene>"; |
118 | 118 | ||
119 | return serialization; | 119 | return serialization; |
120 | } | 120 | } |
121 | } | 121 | } |
122 | } \ No newline at end of file | 122 | } \ 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 @@ | |||
28 | using OpenSim.Region.Environment.Scenes; | 28 | using OpenSim.Region.Environment.Scenes; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 30 | namespace OpenSim.Region.Environment.Modules.World.Archiver |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// Interface to region archive functionality | 33 | /// Interface to region archive functionality |
34 | /// </summary> | 34 | /// </summary> |
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
39 | /// </summary> | 39 | /// </summary> |
40 | /// <param name="savePath"></param> | 40 | /// <param name="savePath"></param> |
41 | void ArchiveRegion(string savePath); | 41 | void ArchiveRegion(string savePath); |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Dearchive the given region archive into the scene | 44 | /// Dearchive the given region archive into the scene |
45 | /// </summary> | 45 | /// </summary> |
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 | |||
731 | if (obj.OwnerID == owners[i]) | 731 | if (obj.OwnerID == owners[i]) |
732 | objlist.Add(obj); | 732 | objlist.Add(obj); |
733 | } | 733 | } |
734 | } | 734 | } |
735 | catch (InvalidOperationException) | 735 | catch (InvalidOperationException) |
736 | { | 736 | { |
737 | m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr."); | 737 | 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 | |||
751 | landData.ownerPrims = 0; | 751 | landData.ownerPrims = 0; |
752 | landData.otherPrims = 0; | 752 | landData.otherPrims = 0; |
753 | landData.selectedPrims = 0; | 753 | landData.selectedPrims = 0; |
754 | 754 | ||
755 | 755 | ||
756 | lock (primsOverMe) | 756 | lock (primsOverMe) |
757 | primsOverMe.Clear(); | 757 | primsOverMe.Clear(); |
@@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
759 | 759 | ||
760 | public void addPrimToCount(SceneObjectGroup obj) | 760 | public void addPrimToCount(SceneObjectGroup obj) |
761 | { | 761 | { |
762 | 762 | ||
763 | LLUUID prim_owner = obj.OwnerID; | 763 | LLUUID prim_owner = obj.OwnerID; |
764 | int prim_count = obj.PrimCount; | 764 | int prim_count = obj.PrimCount; |
765 | 765 | ||