diff options
| author | Justin Clark-Casey (justincc) | 2011-04-18 23:22:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-04-18 23:22:04 +0100 |
| commit | 36c4e94ef739f2d58ff26ae2313e5a930ff02021 (patch) | |
| tree | d23742a5d9190c0abaad9c2e401e7213bd3f21a4 /OpenSim/Region/CoreModules/Avatar/Assets | |
| parent | bump default IAR version to 0.2 and 1.1 for the --profile version. (diff) | |
| download | opensim-SC-36c4e94ef739f2d58ff26ae2313e5a930ff02021.zip opensim-SC-36c4e94ef739f2d58ff26ae2313e5a930ff02021.tar.gz opensim-SC-36c4e94ef739f2d58ff26ae2313e5a930ff02021.tar.bz2 opensim-SC-36c4e94ef739f2d58ff26ae2313e5a930ff02021.tar.xz | |
Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Assets')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | 7 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 7 |
2 files changed, 6 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) |