aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2012-08-18 13:17:39 +0100
committerMelanie2012-08-18 13:17:39 +0100
commitaee7a31bc3b5348c883e0d750bab991d853db642 (patch)
tree9d38c2ec7cc62019ab3ea95a3716d28e1451c397 /bin
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.zip
opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.gz
opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.bz2
opensim-SC_OLD-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 'bin')
-rw-r--r--bin/OpenSim.ini.example12
-rw-r--r--bin/OpenSimDefaults.ini3
-rwxr-xr-xbin/lib32/BulletSim.dllbin550400 -> 553472 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2387345 -> 2387051 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin706048 -> 709632 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2599320 -> 2599546 bytes
6 files changed, 14 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9c68b65..eac30b8 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -87,10 +87,18 @@
87 ;; from the selected region_info_source. 87 ;; from the selected region_info_source.
88 ; allow_regionless = false 88 ; allow_regionless = false
89 89
90 ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.01
91 ;; Minimum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMin!).
92 ; NonphysicalPrimMin = 0.01
93
90 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 94 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
91 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 95 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
92 ; NonphysicalPrimMax = 256 96 ; NonphysicalPrimMax = 256
93 97
98 ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10
99 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file.
100 ; PhysicalPrimMin = 0.01
101
94 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10 102 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
95 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. 103 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file.
96 ; PhysicalPrimMax = 10 104 ; PhysicalPrimMax = 10
@@ -675,7 +683,9 @@
675 ;; Maximum number of events to queue for a script (excluding timers) 683 ;; Maximum number of events to queue for a script (excluding timers)
676 ; MaxScriptEventQueue = 300 684 ; MaxScriptEventQueue = 300
677 685
678 ;; Stack size per thread created 686 ;; Stack size per script engine thread in bytes.
687 ;; If you are experiencing StackOverflowExceptions you may want to increase this (e.g. double it).
688 ;; The trade-off may be increased memory usage by the script engine.
679 ; ThreadStackSize = 262144 689 ; ThreadStackSize = 262144
680 690
681 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true 691 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true
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
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 0f2d522..cc55f00 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
Binary files differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 783c9a2..26ad52b 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index c2a2bda..94dae95 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
Binary files differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 74d4f98..52e9960 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ