From 13929613b171c90d4bf634ebb33bdb1180eea7ee Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 Jul 2012 23:18:41 +0100
Subject: Move RegionConfig.ini.example into bin/Regions/Regions.ini.example -
 all other example files are in the same directory as their real files.

Only files ending in .ini and .xml are actually loaded.
Also improves the help at the top of Regions.ini.example to mention that OpenSimulator would generate Regions.ini anyway on first startup.
---
 bin/RegionConfig.ini.example    | 43 -------------------------------------
 bin/Regions/Regions.ini.example | 47 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 43 deletions(-)
 delete mode 100644 bin/RegionConfig.ini.example
 create mode 100644 bin/Regions/Regions.ini.example

(limited to 'bin')

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 @@
-; * This file must be renamed to RegionConfig.ini and moved to the Regions/
-; * subdirectory to work!
-; *
-; * You can put multiple regions into one file or make one file per region
-; * The section name is the region name
-; *
-
-[Default Region]
-
-; *
-; * You MUST change this! It will NOT be done for you!
-; *
-
-RegionUUID = "11111111-2222-3333-4444-555555555555"
-
-Location = "1000,1000"
-InternalAddress = "127.0.0.1"
-InternalPort = 9000
-AllowAlternatePorts = False
-ExternalHostName = "SYSTEMIP"
-
-; *
-; * Prim data
-; * This allows limiting the sizes of prims and the region prim count
-; *
-
-; NonphysicalPrimMax = 256
-; PhysicalPrimMax = 10
-; ClampPrimSize = False
-; MaxPrims = 15000
-; MaxAgents = 100
-
-; *
-; * Multi-Tenancy. Only set if needed
-; *
-
-; ScopeID = "00000000-0000-0000-0000-000000000000"
-
-; *
-; * Product name (used in search from viewer 1.23
-; *
-
-; RegionType = "Mainland"
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example
new file mode 100644
index 0000000..54a841d
--- /dev/null
+++ b/bin/Regions/Regions.ini.example
@@ -0,0 +1,47 @@
+; * This is an example region config file.
+; * 
+; * If OpenSimulator is started up without any regions, it will ask you configuration questions to generate a Regions.ini file for you.
+; * So there is no need to change this file directly, it is only for reference.
+; * However, if you prefer you can also copy this file to Regions.ini and appropriately change the parameters below.
+; * Only files ending with .ini and .xml in this directly will be loaded by OpenSimulator.
+; *
+; * You can multiple regions into one file or make one file per region
+; * The section name is the region name
+; *
+
+[Default Region]
+
+; *
+; * You MUST change this! It will NOT be done for you!
+; *
+
+RegionUUID = "11111111-2222-3333-4444-555555555555"
+
+Location = "1000,1000"
+InternalAddress = "127.0.0.1"
+InternalPort = 9000
+AllowAlternatePorts = False
+ExternalHostName = "SYSTEMIP"
+
+; *
+; * Prim data
+; * This allows limiting the sizes of prims and the region prim count
+; *
+
+; NonphysicalPrimMax = 256
+; PhysicalPrimMax = 10
+; ClampPrimSize = False
+; MaxPrims = 15000
+; MaxAgents = 100
+
+; *
+; * Multi-Tenancy. Only set if needed
+; *
+
+; ScopeID = "00000000-0000-0000-0000-000000000000"
+
+; *
+; * Product name (used in search from viewer 1.23
+; *
+
+; RegionType = "Mainland"
-- 
cgit v1.1


From b25d874afaa5a3111455b9e49a73343b3afd6f14 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 20 Jul 2012 15:34:19 -0700
Subject: BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs
 attempting to fix a mono compile error.

---
 bin/lib32/BulletSim.dll   | Bin 538112 -> 540672 bytes
 bin/lib32/libBulletSim.so | Bin 2334329 -> 2347768 bytes
 bin/lib64/BulletSim.dll   | Bin 690688 -> 694272 bytes
 bin/lib64/libBulletSim.so | Bin 2529000 -> 2545183 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index a3ccb98..b312222 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 0b286aa..da98509 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index d91dac1..25b48c1 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 891c956..3d4b630 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From ac612e21050d35b55161b6f72703b6ecceb5d51d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 20 Jul 2012 16:12:54 -0700
Subject: Update BulletSim DLLs and SOs

---
 bin/lib32/BulletSim.dll | Bin 540672 -> 540672 bytes
 bin/lib64/BulletSim.dll | Bin 694272 -> 694272 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index b312222..8791ba5 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 25b48c1..9af5dab 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
-- 
cgit v1.1


From 892dd59b1314c251fb9929a33c067089c3b77e28 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 23 Jul 2012 16:38:31 -0700
Subject: BulletSim: update BulletSim.dlls and so's

---
 bin/lib32/BulletSim.dll   | Bin 540672 -> 540672 bytes
 bin/lib32/libBulletSim.so | Bin 2347768 -> 2461336 bytes
 bin/lib64/BulletSim.dll   | Bin 694272 -> 694272 bytes
 bin/lib64/libBulletSim.so | Bin 2545183 -> 2669479 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 8791ba5..322322a 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index da98509..493c8cb 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 9af5dab..2bd13b8 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 3d4b630..af3a078 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From d7add2940a38437e748ca74163bbf37acecfa04c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 25 Jul 2012 14:52:17 -0700
Subject: BulletSim: add parameters for setting linkset constraint factors

---
 bin/OpenSimDefaults.ini | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ededdc05..5935ca1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -914,6 +914,12 @@
     ShouldEnableFrictionCaching = False;
     NumberOfSolverIterations = 0;   
 
+    ; Linkset constraint parameters
+    LinkConstraintUseFrameOffset = True;
+    LinkConstraintEnableTransMotor = True;
+    LinkConstraintTransMotorMaxVel = 5.0;
+    LinkConstraintTransMotorMaxForce = 0.1;
+
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
-- 
cgit v1.1


From c6d02801db2c60218960bf8dbfed0dafe3b02481 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 25 Jul 2012 16:29:51 -0700
Subject: BulletSim: update BulletSim DLLs and SOs

---
 bin/lib32/BulletSim.dll   | Bin 540672 -> 541184 bytes
 bin/lib32/libBulletSim.so | Bin 2461336 -> 2469030 bytes
 bin/lib64/BulletSim.dll   | Bin 694272 -> 695296 bytes
 bin/lib64/libBulletSim.so | Bin 2669479 -> 2677809 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 322322a..c6bb76a 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 493c8cb..6ca98cc 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 2bd13b8..0924dd0 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index af3a078..70bcdb7 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 7d30637d51c64a582cc55d41546af8f0cfc889ba Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 26 Jul 2012 14:54:57 -0700
Subject: BulletSim: refactor all the linkset logic out of the prim class and
 into its own class. The BulletSim data structures track individual prims as
 linksets of 1 so most of the prim code is not different between a linked and
 unlinked object.

---
 bin/OpenSimDefaults.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5935ca1..f92c555 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -915,7 +915,7 @@
     NumberOfSolverIterations = 0;   
 
     ; Linkset constraint parameters
-    LinkConstraintUseFrameOffset = True;
+    LinkConstraintUseFrameOffset = False;
     LinkConstraintEnableTransMotor = True;
     LinkConstraintTransMotorMaxVel = 5.0;
     LinkConstraintTransMotorMaxForce = 0.1;
@@ -937,7 +937,7 @@
     FixedTimeStep = .01667
 
     MaxCollisionsPerFrame = 2048
-    MaxUpdatesPerFrame = 2048
+    MaxUpdatesPerFrame = 8192
 
 [RemoteAdmin]
     enabled = false
-- 
cgit v1.1


From 811dc95105e73e49330cd6ae02413f0d961b5b21 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Jul 2012 20:16:29 +0100
Subject: Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012)

Built from https://github.com/openmetaversefoundation/libopenmetaverse/commits/master
This update incorporates a fix by Melanie in libomv where textures would sometimes rotate slightly when other properties were changed.
Hence addresses http://opensimulator.org/mantis/view.php?id=6100
This update also incorporates libomv bot code updates that significantly reduce the warning spam for pCampbot.
The change rate of libomv is low and many changes refer to bot or code not used by OpenSimulator, so I think it is sufficiently stable to use evne though it's not a release.
---
 bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 24576 -> 11776 bytes
 bin/OpenMetaverse.StructuredData.dll        | Bin 102400 -> 95744 bytes
 bin/OpenMetaverse.dll                       | Bin 1753088 -> 1829888 bytes
 bin/OpenMetaverseTypes.dll                  | Bin 114688 -> 106496 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index e0a3aa5..442f683 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index aa05418..7c8006f 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 523f5a7..7870e77 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index e3356c9..b846ee3 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From cd44c3b90aca206c9b0396e2cd01e43c2defb7ab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Jul 2012 21:50:18 +0100
Subject: Replace libopenmetaverse commit 6212cbd with the same libraries but
 this time built with xbuild rather than nant.

This may fix Windows and some mono version builds.
---
 bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 11776 -> 11776 bytes
 bin/OpenMetaverse.StructuredData.dll        | Bin 95744 -> 95744 bytes
 bin/OpenMetaverse.dll                       | Bin 1829888 -> 1826816 bytes
 bin/OpenMetaverseTypes.dll                  | Bin 106496 -> 105984 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 442f683..bdded3f 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 7c8006f..f8f1536 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 7870e77..320f57c 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index b846ee3..9d8bd8e 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From 134c6d181f1eaaf51a93b1e82616308f8d7ff700 Mon Sep 17 00:00:00 2001
From: justincc
Date: Fri, 27 Jul 2012 23:05:17 +0100
Subject: Update OpenMetaverse libraries at commit 6212cbd, this time built on
 Windows This is to try and resolve a strange Initialization exception for the
 AppearanceManager type that only occurs on Windows 64 bit (not Windows 32 bit
 or Linux!)

---
 bin/Ionic.Zip.dll                           | Bin
 bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 11776 -> 24576 bytes
 bin/OpenMetaverse.StructuredData.dll        | Bin 95744 -> 114688 bytes
 bin/OpenMetaverse.dll                       | Bin 1826816 -> 1904640 bytes
 bin/OpenMetaverseTypes.dll                  | Bin 105984 -> 122880 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/Ionic.Zip.dll

(limited to 'bin')

diff --git a/bin/Ionic.Zip.dll b/bin/Ionic.Zip.dll
old mode 100644
new mode 100755
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index bdded3f..1b4cab5 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index f8f1536..7b5174d 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 320f57c..a08b406 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 9d8bd8e..fc4f8eb 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From e60ec599e5c4184275037b0538092be6cf098de1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 28 Jul 2012 00:41:31 +0100
Subject: Add master's new binaries

---
 bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 11776 -> 24576 bytes
 bin/OpenMetaverse.StructuredData.dll        | Bin 95232 -> 114688 bytes
 bin/OpenMetaverse.dll                       | Bin 1812992 -> 1904640 bytes
 bin/OpenMetaverseTypes.dll                  | Bin 105984 -> 122880 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 43c7557..1b4cab5 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index bf76863..7b5174d 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 7e742e2..a08b406 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index fd9ce88..fc4f8eb 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From f9a8915cca710419847a8e0ea9c75f9a6a70daa6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 31 Jul 2012 09:44:32 -0700
Subject: BulletSim: update the DLLs and SOs. This fixes the exception on
 shutdown

---
 bin/lib32/BulletSim.dll   | Bin 541184 -> 541696 bytes
 bin/lib32/libBulletSim.so | Bin 2469030 -> 2469830 bytes
 bin/lib64/BulletSim.dll   | Bin 695296 -> 696832 bytes
 bin/lib64/libBulletSim.so | Bin 2677809 -> 2678661 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index c6bb76a..06a3cf1 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 6ca98cc..ce187b0 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 0924dd0..f51c978 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 70bcdb7..2476865 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From c51ef38e2d867d63d2d32b1a7d284033e60d9952 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 31 Jul 2012 16:22:50 -0700
Subject: BulletSim: fix problem where resizing a primary shape (cube or
 sphere) would not rebuild the physics mesh. Update the DLLs and SOs to latest
 version.

---
 bin/lib32/BulletSim.dll   | Bin 541696 -> 532480 bytes
 bin/lib32/libBulletSim.so | Bin 2469830 -> 2321137 bytes
 bin/lib64/BulletSim.dll   | Bin 696832 -> 683008 bytes
 bin/lib64/libBulletSim.so | Bin 2678661 -> 2516576 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 06a3cf1..fd8f39a 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index ce187b0..72847e7 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index f51c978..300e4be 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 2476865..1acc0dd 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1