diff options
| author | BlueWall | 2011-04-21 19:04:41 -0400 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-04-22 00:39:39 +0100 |
| commit | 70e8e8a7858c8322da76e860677d4a7ec3e399e5 (patch) | |
| tree | 805c44ef2460a7f89edec37e6f8416622d728fce | |
| parent | change flavour to rc1 (diff) | |
| download | opensim-SC_OLD-70e8e8a7858c8322da76e860677d4a7ec3e399e5.zip opensim-SC_OLD-70e8e8a7858c8322da76e860677d4a7ec3e399e5.tar.gz opensim-SC_OLD-70e8e8a7858c8322da76e860677d4a7ec3e399e5.tar.bz2 opensim-SC_OLD-70e8e8a7858c8322da76e860677d4a7ec3e399e5.tar.xz | |
some mesh config asthetics0.7.1-rc1
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 2 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index deec444..fc1ddef 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | |||
| @@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
| 70 | if (meshConfig == null) | 70 | if (meshConfig == null) |
| 71 | return; | 71 | return; |
| 72 | 72 | ||
| 73 | m_enabled = meshConfig.GetBoolean("ColladaMesh", true); | 73 | m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true); |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | 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 d651cb2..3d4c7b7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | |||
| @@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
| 72 | if (meshConfig == null) | 72 | if (meshConfig == null) |
| 73 | return; | 73 | return; |
| 74 | 74 | ||
| 75 | m_enabled = meshConfig.GetBoolean("ColladaMesh", true); | 75 | m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | public void AddRegion(Scene pScene) | 78 | public void AddRegion(Scene pScene) |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 2521c6c..8942e4f 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -453,7 +453,7 @@ | |||
| 453 | [Mesh] | 453 | [Mesh] |
| 454 | ; enable / disable Collada mesh support | 454 | ; enable / disable Collada mesh support |
| 455 | ; default is true | 455 | ; default is true |
| 456 | ColladaMesh = true | 456 | AllowMeshUpload = true |
| 457 | 457 | ||
| 458 | ; if you use Meshmerizer and want collisions for meshies, setting this to true | 458 | ; if you use Meshmerizer and want collisions for meshies, setting this to true |
| 459 | ; will cause OpenSim to attempt to decode meshies assets, extract the physics | 459 | ; will cause OpenSim to attempt to decode meshies assets, extract the physics |