ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
This commit is contained in:
Melanie
2013-08-01 23:42:19 +01:00
parent 21f5e67030 7a5d11f8a7
commit 6fc03c7e6e
5 changed files with 112 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/OpenSimDefaults.ini
View File

@@ -703,11 +703,18 @@
; on every login
ReuseTextures = false
[Attachments]
; Controls whether avatar attachments are enabled.
; Defaults to true - only set to false for debugging purposes
Enabled = true
; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments
; Experimental setting to control CPU spiking when avatars with many attachments login
; or when multiple avatars with medium level attachments login simultaneously.
; If 0 then no throttling is performed.
ThrottlePer100PrimsRezzed = 0;
[Mesh]
; enable / disable Collada mesh support