diff options
author | Justin Clark-Casey (justincc) | 2012-03-07 01:11:37 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-07 01:11:37 +0000 |
commit | 6bdea15ecf6fdaaf705704dddf9199b882675963 (patch) | |
tree | a53847864967258081dde6b4fa1206426ee11592 /OpenSim/Tests/Common | |
parent | Stop individually deleting objects at the end of each ObjectTortureTest. (diff) | |
download | opensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.zip opensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.tar.gz opensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.tar.bz2 opensim-SC_OLD-6bdea15ecf6fdaaf705704dddf9199b882675963.tar.xz |
minor: make NPC tests run in a given order, comment out log lines in mock region data plugins, null out scene in script and npc torture tests, add other doc comments to torture tests
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs index 79bb9c2..295e868 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
@@ -177,9 +177,9 @@ namespace OpenSim.Data.Null | |||
177 | // Therefore, we need to store parts rather than groups. | 177 | // Therefore, we need to store parts rather than groups. |
178 | foreach (SceneObjectPart prim in obj.Parts) | 178 | foreach (SceneObjectPart prim in obj.Parts) |
179 | { | 179 | { |
180 | m_log.DebugFormat( | 180 | // m_log.DebugFormat( |
181 | "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", | 181 | // "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", |
182 | prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID); | 182 | // prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID); |
183 | 183 | ||
184 | m_sceneObjectParts[prim.UUID] = prim; | 184 | m_sceneObjectParts[prim.UUID] = prim; |
185 | } | 185 | } |
@@ -193,9 +193,9 @@ namespace OpenSim.Data.Null | |||
193 | { | 193 | { |
194 | if (part.ParentGroup.UUID == obj) | 194 | if (part.ParentGroup.UUID == obj) |
195 | { | 195 | { |
196 | m_log.DebugFormat( | 196 | // m_log.DebugFormat( |
197 | "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", | 197 | // "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", |
198 | part.Name, part.UUID, obj, regionUUID); | 198 | // part.Name, part.UUID, obj, regionUUID); |
199 | m_sceneObjectParts.Remove(part.UUID); | 199 | m_sceneObjectParts.Remove(part.UUID); |
200 | } | 200 | } |
201 | } | 201 | } |
@@ -215,8 +215,8 @@ namespace OpenSim.Data.Null | |||
215 | { | 215 | { |
216 | if (prim.IsRoot) | 216 | if (prim.IsRoot) |
217 | { | 217 | { |
218 | m_log.DebugFormat( | 218 | // m_log.DebugFormat( |
219 | "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID); | 219 | // "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID); |
220 | objects[prim.UUID] = new SceneObjectGroup(prim); | 220 | objects[prim.UUID] = new SceneObjectGroup(prim); |
221 | } | 221 | } |
222 | } | 222 | } |
@@ -240,9 +240,9 @@ namespace OpenSim.Data.Null | |||
240 | } | 240 | } |
241 | else | 241 | else |
242 | { | 242 | { |
243 | m_log.WarnFormat( | 243 | // m_log.WarnFormat( |
244 | "[MOCK REGION DATA PLUGIN]: Database contains an orphan child prim {0} {1} in region {2} pointing to missing parent {3}. This prim will not be loaded.", | 244 | // "[MOCK REGION DATA PLUGIN]: Database contains an orphan child prim {0} {1} in region {2} pointing to missing parent {3}. This prim will not be loaded.", |
245 | prim.Name, prim.UUID, regionUUID, prim.ParentUUID); | 245 | // prim.Name, prim.UUID, regionUUID, prim.ParentUUID); |
246 | } | 246 | } |
247 | } | 247 | } |
248 | } | 248 | } |