diff options
| author | Melanie | 2012-10-30 01:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-30 01:02:20 +0000 |
| commit | 48569e856a9c9ced207652b10e2abde94c849687 (patch) | |
| tree | 8955c0206f1822f4bbb44466fae74e18923d125c /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Make MeshAssetReceived private. (diff) | |
| download | opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.zip opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.gz opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.bz2 opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index efcca70..ae5e788 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1683,5 +1683,12 @@ Enabled = False | |||
| 1683 | ;; default is module is disabled at the top level | 1683 | ;; default is module is disabled at the top level |
| 1684 | AutoBackupModuleEnabled = false | 1684 | AutoBackupModuleEnabled = false |
| 1685 | 1685 | ||
| 1686 | [Sounds] | ||
| 1687 | ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule} | ||
| 1688 | Module = OpenSim.Region.CoreModules.dll:SoundModule | ||
| 1689 | |||
| 1690 | ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0} | ||
| 1691 | MaxDistance = 100.0 | ||
| 1692 | |||
| 1686 | [Modules] | 1693 | [Modules] |
| 1687 | Include-modules = "addon-modules/*/config/*.ini" | 1694 | Include-modules = "addon-modules/*/config/*.ini" |