diff options
| author | Melanie | 2013-08-07 23:29:42 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-07 23:29:42 +0100 |
| commit | 005c69511dac490a8353233423a3152abf5580dd (patch) | |
| tree | abae7717af4af3ed7844f3747ab28398fdad9cdf /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | minor: add some method doc to ScenePresence fields used for entity transfer, ... (diff) | |
| download | opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.zip opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.gz opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.bz2 opensim-SC_OLD-005c69511dac490a8353233423a3152abf5580dd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 286076da..f8e2829 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -710,8 +710,8 @@ | |||
| 710 | Enabled = true | 710 | Enabled = true |
| 711 | 711 | ||
| 712 | ; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments | 712 | ; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments |
| 713 | ; Experimental setting to control CPU spiking when avatars with many attachments login | 713 | ; Experimental setting to control CPU spiking when avatars with many attachments login/change outfit |
| 714 | ; or when multiple avatars with medium level attachments login simultaneously. | 714 | ; or when multiple avatars with medium level attachments login/change outfit simultaneously. |
| 715 | ; If 0 then no throttling is performed. | 715 | ; If 0 then no throttling is performed. |
| 716 | ThrottlePer100PrimsRezzed = 0; | 716 | ThrottlePer100PrimsRezzed = 0; |
| 717 | 717 | ||