aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-12 14:21:51 -0700
committerJohn Hurliman2010-09-12 14:21:51 -0700
commitc03b24cbfdc449cf326cf0f560395753339169dc (patch)
treed62a666839d3c638b5c9799c70be971a2d6d6c18 /OpenSim/Tests/Common/Mock
parent* Added ISimulationDataService and IEstateDataService (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.zip
opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.gz
opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.bz2
opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.xz
Merged
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs6
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs2
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 315d405..f453a4b 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Data.Null
99 } 99 }
100 100
101 public void RemoveObject(UUID obj, UUID regionUUID) 101 public void RemoveObject(UUID obj, UUID regionUUID)
102 { 102 {
103 // All parts belonging to the object with the uuid are removed. 103 // All parts belonging to the object with the uuid are removed.
104 List<SceneObjectPart> parts = new List<SceneObjectPart>(m_sceneObjectParts.Values); 104 List<SceneObjectPart> parts = new List<SceneObjectPart>(m_sceneObjectParts.Values);
105 foreach (SceneObjectPart part in parts) 105 foreach (SceneObjectPart part in parts)
@@ -108,7 +108,7 @@ namespace OpenSim.Data.Null
108 { 108 {
109 m_log.DebugFormat( 109 m_log.DebugFormat(
110 "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", 110 "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}",
111 part.Name, part.UUID, obj, regionUUID); 111 part.Name, part.UUID, obj, regionUUID);
112 m_sceneObjectParts.Remove(part.UUID); 112 m_sceneObjectParts.Remove(part.UUID);
113 } 113 }
114 } 114 }
@@ -129,7 +129,7 @@ namespace OpenSim.Data.Null
129 if (prim.IsRoot) 129 if (prim.IsRoot)
130 { 130 {
131 m_log.DebugFormat( 131 m_log.DebugFormat(
132 "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID); 132 "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID);
133 objects[prim.UUID] = new SceneObjectGroup(prim); 133 objects[prim.UUID] = new SceneObjectGroup(prim);
134 } 134 }
135 } 135 }
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 4511228..0e1433a 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -65,6 +65,6 @@ namespace OpenSim.Tests.Common.Mock
65 public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter 65 public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
66 { 66 {
67 get { return m_asyncSceneObjectDeleter; } 67 get { return m_asyncSceneObjectDeleter; }
68 } 68 }
69 } 69 }
70} \ No newline at end of file 70} \ No newline at end of file