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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2011-04-22 08:55:12 +01:00
parent 0c68fbdb1a cbe49ed917
commit c411ab54ee
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
if (meshConfig == null) if (meshConfig == null)
return; return;
m_enabled = meshConfig.GetBoolean("ColladaMesh", true); m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
} }
public void AddRegion(Scene pScene) public void AddRegion(Scene pScene)

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

@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
if (meshConfig == null) if (meshConfig == null)
return; return;
m_enabled = meshConfig.GetBoolean("ColladaMesh", true); m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
} }
public void AddRegion(Scene pScene) public void AddRegion(Scene pScene)

2
bin/OpenSimDefaults.ini
View File

@ -453,7 +453,7 @@
[Mesh] [Mesh]
; enable / disable Collada mesh support ; enable / disable Collada mesh support
; default is true ; default is true
ColladaMesh = true ; AllowMeshUpload = true
; if you use Meshmerizer and want collisions for meshies, setting this to true ; if you use Meshmerizer and want collisions for meshies, setting this to true
; will cause OpenSim to attempt to decode meshies assets, extract the physics ; will cause OpenSim to attempt to decode meshies assets, extract the physics