OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
bulletsim
Justin Clark-Casey (justincc) 2011-04-18 23:22:04 +01:00
parent f5a041d012
commit 36c4e94ef7
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
View File

@ -66,12 +66,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig startupConfig = source.Configs["Startup"]; IConfig meshConfig = source.Configs["Mesh"];
if (startupConfig == null) if (meshConfig == null)
return; return;
if (!startupConfig.GetBoolean("ColladaMesh",true)) m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
m_enabled = false;
} }
public void AddRegion(Scene pScene) public void AddRegion(Scene pScene)

7
OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
View File

@ -68,12 +68,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig startupConfig = source.Configs["Startup"]; IConfig meshConfig = source.Configs["Mesh"];
if (startupConfig == null) if (meshConfig == null)
return; return;
if (!startupConfig.GetBoolean("ColladaMesh",true)) m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
m_enabled = false;
} }
public void AddRegion(Scene pScene) public void AddRegion(Scene pScene)

6
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
View File

@ -82,6 +82,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// </summary> /// </summary>
public bool ControlFileLoaded { get; private set; } public bool ControlFileLoaded { get; private set; }
/// <summary>
/// Do we want to enforce the check. IAR versions before 0.2 and 1.1 do not guarantee this order, so we can't
/// enforce.
/// </summary>
public bool EnforceControlFileCheck { get; private set; }
protected bool m_assetsLoaded; protected bool m_assetsLoaded;
protected bool m_inventoryNodesLoaded; protected bool m_inventoryNodesLoaded;

10
bin/OpenSimDefaults.ini
View File

@ -155,10 +155,6 @@
; it may cause unexpected physics problems. ; it may cause unexpected physics problems.
;UseMeshiesPhysicsMesh = false ;UseMeshiesPhysicsMesh = false
; enable / disable Collada mesh support
; default is true
; ColladaMesh = true
; Choose one of the physics engines below ; Choose one of the physics engines below
; OpenDynamicsEngine is by some distance the most developed physics engine ; OpenDynamicsEngine is by some distance the most developed physics engine
; basicphysics effectively does not model physics at all, making all objects phantom ; basicphysics effectively does not model physics at all, making all objects phantom
@ -460,6 +456,12 @@
CoalesceMultipleObjectsToInventory = true CoalesceMultipleObjectsToInventory = true
[Mesh]
; enable / disable Collada mesh support
; default is true
; ColladaMesh = true
[ODEPhysicsSettings] [ODEPhysicsSettings]
;## ;##
;## World Settings ;## World Settings