diff options
| author | Melanie | 2012-09-24 20:14:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-24 20:14:00 +0100 |
| commit | bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6 (patch) | |
| tree | 2ac67907f6333bbbc9e4d821c6607b53d0e22acb /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | HG Rez object: warn the user if the item or asset cannot be found. (diff) | |
| download | opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.zip opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.gz opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.bz2 opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 1dc3f15..fee29c9 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -85,8 +85,8 @@ | |||
| 85 | ;; from the selected region_info_source. | 85 | ;; from the selected region_info_source. |
| 86 | allow_regionless = false | 86 | allow_regionless = false |
| 87 | 87 | ||
| 88 | ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). | 88 | ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMax!). |
| 89 | NonphysicalPrimMax = 256 | 89 | NonPhysicalPrimMax = 256 |
| 90 | 90 | ||
| 91 | ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. | 91 | ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. |
| 92 | PhysicalPrimMax = 10 | 92 | PhysicalPrimMax = 10 |
| @@ -673,8 +673,7 @@ | |||
| 673 | ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. | 673 | ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. |
| 674 | ; This may help with some situations where avatars are persistently grey, though it will not help | 674 | ; This may help with some situations where avatars are persistently grey, though it will not help |
| 675 | ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). | 675 | ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). |
| 676 | ; This setting is experimental. | 676 | ResendAppearanceUpdates = true |
| 677 | ResendAppearanceUpdates = false | ||
| 678 | 677 | ||
| 679 | 678 | ||
| 680 | [Attachments] | 679 | [Attachments] |