diff options
| author | Melanie | 2012-08-18 13:17:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-18 13:17:39 +0100 |
| commit | aee7a31bc3b5348c883e0d750bab991d853db642 (patch) | |
| tree | 9d38c2ec7cc62019ab3ea95a3716d28e1451c397 /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-aee7a31bc3b5348c883e0d750bab991d853db642.zip opensim-SC-aee7a31bc3b5348c883e0d750bab991d853db642.tar.gz opensim-SC-aee7a31bc3b5348c883e0d750bab991d853db642.tar.bz2 opensim-SC-aee7a31bc3b5348c883e0d750bab991d853db642.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 554aafa..1f2d189 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -931,6 +931,9 @@ | |||
| 931 | 931 | ||
| 932 | ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail | 932 | ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail |
| 933 | MeshLevelOfDetail = 8 | 933 | MeshLevelOfDetail = 8 |
| 934 | ; if mesh size is > threshold meters, we need to add more detail because people will notice | ||
| 935 | MeshLevelOfDetailMegaPrimThreshold = 10 | ||
| 936 | MeshLevelOfDetailMegaPrim = 16 | ||
| 934 | ; number^2 non-physical level of detail of the sculpt texture. 32x32 - 1024 verticies | 937 | ; number^2 non-physical level of detail of the sculpt texture. 32x32 - 1024 verticies |
| 935 | SculptLevelOfDetail = 32 | 938 | SculptLevelOfDetail = 32 |
| 936 | 939 | ||