aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-18 23:22:04 +0100
committerJustin Clark-Casey (justincc)2011-04-18 23:22:04 +0100
commit36c4e94ef739f2d58ff26ae2313e5a930ff02021 (patch)
treed23742a5d9190c0abaad9c2e401e7213bd3f21a4
parentbump default IAR version to 0.2 and 1.1 for the --profile version. (diff)
downloadopensim-SC_OLD-36c4e94ef739f2d58ff26ae2313e5a930ff02021.zip
opensim-SC_OLD-36c4e94ef739f2d58ff26ae2313e5a930ff02021.tar.gz
opensim-SC_OLD-36c4e94ef739f2d58ff26ae2313e5a930ff02021.tar.bz2
opensim-SC_OLD-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 '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs6
-rw-r--r--bin/OpenSimDefaults.ini10
4 files changed, 18 insertions, 12 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
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2e0a22b..e72e851 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -155,10 +155,6 @@
155 ; it may cause unexpected physics problems. 155 ; it may cause unexpected physics problems.
156 ;UseMeshiesPhysicsMesh = false 156 ;UseMeshiesPhysicsMesh = false
157 157
158 ; enable / disable Collada mesh support
159 ; default is true
160 ; ColladaMesh = true
161
162 ; Choose one of the physics engines below 158 ; Choose one of the physics engines below
163 ; OpenDynamicsEngine is by some distance the most developed physics engine 159 ; OpenDynamicsEngine is by some distance the most developed physics engine
164 ; basicphysics effectively does not model physics at all, making all objects phantom 160 ; basicphysics effectively does not model physics at all, making all objects phantom
@@ -460,6 +456,12 @@
460 CoalesceMultipleObjectsToInventory = true 456 CoalesceMultipleObjectsToInventory = true
461 457
462 458
459[Mesh]
460 ; enable / disable Collada mesh support
461 ; default is true
462 ; ColladaMesh = true
463
464
463[ODEPhysicsSettings] 465[ODEPhysicsSettings]
464 ;## 466 ;##
465 ;## World Settings 467 ;## World Settings