diff options
| author | Justin Clark-Casey (justincc) | 2011-04-13 21:48:16 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-04-13 21:48:16 +0100 |
| commit | 68cc5b46fefdf4db68cae1202086257ce731f8a1 (patch) | |
| tree | c7e805586da1aa2b0125db4142cde303a8565cfe /OpenSim/Region/CoreModules/Framework | |
| parent | Fix bug where rezzing coalesced objects would give all objects the same name ... (diff) | |
| download | opensim-SC-68cc5b46fefdf4db68cae1202086257ce731f8a1.zip opensim-SC-68cc5b46fefdf4db68cae1202086257ce731f8a1.tar.gz opensim-SC-68cc5b46fefdf4db68cae1202086257ce731f8a1.tar.bz2 opensim-SC-68cc5b46fefdf4db68cae1202086257ce731f8a1.tar.xz | |
refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index 0f2b610..c197cb9 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | |||
| @@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
| 84 | public void TestRezCoalescedObject() | 84 | public void TestRezCoalescedObject() |
| 85 | { | 85 | { |
| 86 | TestHelper.InMethod(); | 86 | TestHelper.InMethod(); |
| 87 | log4net.Config.XmlConfigurator.Configure(); | 87 | // log4net.Config.XmlConfigurator.Configure(); |
| 88 | 88 | ||
| 89 | // Create asset | 89 | // Create asset |
| 90 | SceneObjectGroup object1; | 90 | SceneObjectGroup object1; |