aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini31
-rw-r--r--bin/Regions/Regions.ini.example4
-rwxr-xr-xbin/lib32/BulletSim.dllbin545280 -> 546304 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1690012 -> 1695269 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin693248 -> 694272 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1834927 -> 1841657 bytes
6 files changed, 6 insertions, 29 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6ebdb96..7bdfd1c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,21 +1,6 @@
1; This file contains defaults for various settings in OpenSimulator. These can be overriden 1; This file contains defaults for various settings in OpenSimulator. These can be overriden
2; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini). 2; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
3 3
4[XMLRPC]
5 ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
6 ;; If enabled and set to XmlRpcRouterModule, this will post an event,
7 ;; "xmlrpc_uri(string)" to the script concurrently with the first
8 ;; remote_data event. This will contain the fully qualified URI an
9 ;; external site needs to use to send XMLRPC requests to that script
10 ;;
11 ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
12 ;; will be registered with an external service via a configured uri
13 XmlRpcRouterModule = "XmlRpcRouterModule"
14
15 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
16 XmlRpcPort = 20800
17
18
19[Startup] 4[Startup]
20 ; Console prompt 5 ; Console prompt
21 ; Certain special characters can be used to customize the prompt 6 ; Certain special characters can be used to customize the prompt
@@ -931,13 +916,9 @@
931 916
932 ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain. If you're using the bulletxna engine, 917 ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain. If you're using the bulletxna engine,
933 ; you will want to switch to the heightfield option 918 ; you will want to switch to the heightfield option
934
935 TerrainImplementation = 1 919 TerrainImplementation = 1
936 ; TerrainImplementation = 0 920 ; TerrainImplementation = 0
937 921
938 DefaultFriction = 0.20
939 DefaultDensity = 10.000006836
940 DefaultRestitution = 0.0
941 Gravity = -9.80665 922 Gravity = -9.80665
942 923
943 TerrainFriction = 0.30 924 TerrainFriction = 0.30
@@ -946,7 +927,7 @@
946 TerrainCollisionMargin = 0.04 927 TerrainCollisionMargin = 0.04
947 928
948 AvatarFriction = 0.2 929 AvatarFriction = 0.2
949 AvatarStandingFriction = 10.0 930 AvatarStandingFriction = 0.95
950 AvatarRestitution = 0.0 931 AvatarRestitution = 0.0
951 AvatarDensity = 3.5 932 AvatarDensity = 3.5
952 AvatarCapsuleWidth = 0.6 933 AvatarCapsuleWidth = 0.6
@@ -958,7 +939,7 @@
958 939
959 CollisionMargin = 0.04 940 CollisionMargin = 0.04
960 941
961 ; Linkset constraint parameters 942 ; Linkset implmentation
962 LinkImplementation = 1 ; 0=constraint, 1=compound 943 LinkImplementation = 1 ; 0=constraint, 1=compound
963 944
964 ; Whether to mesh sculpties 945 ; Whether to mesh sculpties
@@ -967,14 +948,6 @@
967 ; If 'true', force simple prims (box and sphere) to be meshed 948 ; If 'true', force simple prims (box and sphere) to be meshed
968 ForceSimplePrimMeshing = false 949 ForceSimplePrimMeshing = false
969 950
970 ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail
971 MeshLevelOfDetail = 8
972 ; if mesh size is > threshold meters, we need to add more detail because people will notice
973 MeshLevelOfDetailMegaPrimThreshold = 10
974 MeshLevelOfDetailMegaPrim = 16
975 ; number^2 non-physical level of detail of the sculpt texture. 32x32 - 1024 verticies
976 SculptLevelOfDetail = 32
977
978 ; Bullet step parameters 951 ; Bullet step parameters
979 MaxSubSteps = 10 952 MaxSubSteps = 10
980 FixedTimeStep = .01667 953 FixedTimeStep = .01667
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example
index f5282a7..ab3a62a 100644
--- a/bin/Regions/Regions.ini.example
+++ b/bin/Regions/Regions.ini.example
@@ -45,4 +45,8 @@ ExternalHostName = "SYSTEMIP"
45; * 45; *
46 46
47; RegionType = "Mainland" 47; RegionType = "Mainland"
48
49; *
50; * UUID of texture to use as a maptile for this region.
51; * Only set if you have disabled dynamic generation of the map tile from the region contents.
48; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" 52; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 24dffac..de4f95a 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 7e3ed20..674a08a 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 808f433..1c55b19 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 9382751..e2fc8bd 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ