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