diff options
Diffstat (limited to 'OpenSim')
3 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index d2278bc..deec444 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | |||
| @@ -66,12 +66,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
| 66 | 66 | ||
| 67 | public void Initialise(IConfigSource source) | 67 | public void Initialise(IConfigSource source) |
| 68 | { | 68 | { |
| 69 | IConfig startupConfig = source.Configs["Startup"]; | 69 | IConfig meshConfig = source.Configs["Mesh"]; |
| 70 | if (startupConfig == null) | 70 | if (meshConfig == null) |
| 71 | return; | 71 | return; |
| 72 | 72 | ||
| 73 | if (!startupConfig.GetBoolean("ColladaMesh",true)) | 73 | m_enabled = meshConfig.GetBoolean("ColladaMesh", true); |
| 74 | m_enabled = false; | ||
| 75 | } | 74 | } |
| 76 | 75 | ||
| 77 | public void AddRegion(Scene pScene) | 76 | public void AddRegion(Scene pScene) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index fb07cc9..d651cb2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | |||
| @@ -68,12 +68,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
| 68 | 68 | ||
| 69 | public void Initialise(IConfigSource source) | 69 | public void Initialise(IConfigSource source) |
| 70 | { | 70 | { |
| 71 | IConfig startupConfig = source.Configs["Startup"]; | 71 | IConfig meshConfig = source.Configs["Mesh"]; |
| 72 | if (startupConfig == null) | 72 | if (meshConfig == null) |
| 73 | return; | 73 | return; |
| 74 | 74 | ||
| 75 | if (!startupConfig.GetBoolean("ColladaMesh",true)) | 75 | m_enabled = meshConfig.GetBoolean("ColladaMesh", true); |
| 76 | m_enabled = false; | ||
| 77 | } | 76 | } |
| 78 | 77 | ||
| 79 | public void AddRegion(Scene pScene) | 78 | public void AddRegion(Scene pScene) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index a12931f..6b24718 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
| @@ -82,6 +82,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 82 | /// </summary> | 82 | /// </summary> |
| 83 | public bool ControlFileLoaded { get; private set; } | 83 | public bool ControlFileLoaded { get; private set; } |
| 84 | 84 | ||
| 85 | /// <summary> | ||
| 86 | /// Do we want to enforce the check. IAR versions before 0.2 and 1.1 do not guarantee this order, so we can't | ||
| 87 | /// enforce. | ||
| 88 | /// </summary> | ||
| 89 | public bool EnforceControlFileCheck { get; private set; } | ||
| 90 | |||
| 85 | protected bool m_assetsLoaded; | 91 | protected bool m_assetsLoaded; |
| 86 | protected bool m_inventoryNodesLoaded; | 92 | protected bool m_inventoryNodesLoaded; |
| 87 | 93 | ||