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/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2012-12-30 03:43:51 +00:00
parent 3ab1bd0403 28a8949b9f
commit 7e98dfd70b
7 changed files with 154 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/OpenSimDefaults.ini
View File

@@ -915,9 +915,9 @@
TerrainCollisionMargin = 0.04
AvatarFriction = 0.2
AvatarStandingFriction = 0.99
AvatarStandingFriction = 10.0
AvatarRestitution = 0.0
AvatarDensity = 60.0
AvatarDensity = 3.5
AvatarCapsuleWidth = 0.6
AvatarCapsuleDepth = 0.45
AvatarCapsuleHeight = 1.5