diff options
| author | Melanie | 2011-04-22 08:55:12 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-22 08:55:12 +0100 |
| commit | c411ab54ee3f92c89bdd1958a56e4d12b805ffb4 (patch) | |
| tree | 77d4c92ed047c11e90fe010857602860d490b961 | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC_OLD-c411ab54ee3f92c89bdd1958a56e4d12b805ffb4.zip opensim-SC_OLD-c411ab54ee3f92c89bdd1958a56e4d12b805ffb4.tar.gz opensim-SC_OLD-c411ab54ee3f92c89bdd1958a56e4d12b805ffb4.tar.bz2 opensim-SC_OLD-c411ab54ee3f92c89bdd1958a56e4d12b805ffb4.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -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 f72cd8e..4c0c794 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 |