aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorubit2012-08-02 18:13:59 +0200
committerubit2012-08-02 18:13:59 +0200
commit3d68d1deda535ee4d628d42396b212666f0a305e (patch)
tree17acbb70a89c037f7996ec7a80bee49c6c9e6fe8
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
downloadopensim-SC-3d68d1deda535ee4d628d42396b212666f0a305e.zip
opensim-SC-3d68d1deda535ee4d628d42396b212666f0a305e.tar.gz
opensim-SC-3d68d1deda535ee4d628d42396b212666f0a305e.tar.bz2
opensim-SC-3d68d1deda535ee4d628d42396b212666f0a305e.tar.xz
i local libs commit
-rwxr-xr-x[-rw-r--r--]bin/Ionic.Zip.dllbin462336 -> 462336 bytes
-rwxr-xr-xbin/OpenMetaverse.Rendering.Meshmerizer.dllbin11776 -> 24576 bytes
-rwxr-xr-xbin/OpenMetaverse.StructuredData.dllbin95232 -> 114688 bytes
-rwxr-xr-xbin/OpenMetaverse.dllbin1812992 -> 1904640 bytes
-rwxr-xr-xbin/OpenMetaverseTypes.dllbin105984 -> 122880 bytes
-rw-r--r--bin/OpenSimDefaults.ini8
-rw-r--r--bin/RegionConfig.ini.example43
-rwxr-xr-xbin/lib32/BulletSim.dllbin538112 -> 541696 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2334329 -> 2469830 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin690688 -> 696832 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2529000 -> 2678661 bytes
11 files changed, 7 insertions, 44 deletions
diff --git a/bin/Ionic.Zip.dll b/bin/Ionic.Zip.dll
index 95fa928..95fa928 100644..100755
--- a/bin/Ionic.Zip.dll
+++ b/bin/Ionic.Zip.dll
Binary files differ
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 43c7557..1b4cab5 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
Binary files differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index bf76863..7b5174d 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 7e742e2..a08b406 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index fd9ce88..fc4f8eb 100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6d699fd..80d17d9 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -914,6 +914,12 @@
914 ShouldEnableFrictionCaching = False; 914 ShouldEnableFrictionCaching = False;
915 NumberOfSolverIterations = 0; 915 NumberOfSolverIterations = 0;
916 916
917 ; Linkset constraint parameters
918 LinkConstraintUseFrameOffset = False;
919 LinkConstraintEnableTransMotor = True;
920 LinkConstraintTransMotorMaxVel = 5.0;
921 LinkConstraintTransMotorMaxForce = 0.1;
922
917 923
918 ; Whether to mesh sculpties 924 ; Whether to mesh sculpties
919 MeshSculptedPrim = true 925 MeshSculptedPrim = true
@@ -931,7 +937,7 @@
931 FixedTimeStep = .01667 937 FixedTimeStep = .01667
932 938
933 MaxCollisionsPerFrame = 2048 939 MaxCollisionsPerFrame = 2048
934 MaxUpdatesPerFrame = 2048 940 MaxUpdatesPerFrame = 8192
935 941
936[RemoteAdmin] 942[RemoteAdmin]
937 enabled = false 943 enabled = false
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example
deleted file mode 100644
index ff00ddf..0000000
--- a/bin/RegionConfig.ini.example
+++ /dev/null
@@ -1,43 +0,0 @@
1; * This file must be renamed to RegionConfig.ini and moved to the Regions/
2; * subdirectory to work!
3; *
4; * You can put multiple regions into one file or make one file per region
5; * The section name is the region name
6; *
7
8[Default Region]
9
10; *
11; * You MUST change this! It will NOT be done for you!
12; *
13
14RegionUUID = "11111111-2222-3333-4444-555555555555"
15
16Location = "1000,1000"
17InternalAddress = "127.0.0.1"
18InternalPort = 9000
19AllowAlternatePorts = False
20ExternalHostName = "SYSTEMIP"
21
22; *
23; * Prim data
24; * This allows limiting the sizes of prims and the region prim count
25; *
26
27; NonphysicalPrimMax = 256
28; PhysicalPrimMax = 10
29; ClampPrimSize = False
30; MaxPrims = 15000
31; MaxAgents = 100
32
33; *
34; * Multi-Tenancy. Only set if needed
35; *
36
37; ScopeID = "00000000-0000-0000-0000-000000000000"
38
39; *
40; * Product name (used in search from viewer 1.23
41; *
42
43; RegionType = "Mainland"
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index a3ccb98..06a3cf1 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 0b286aa..ce187b0 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 d91dac1..f51c978 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 891c956..2476865 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ