From 3e5b1a1de5931afc431fe55db4bd3b5e7f0637df Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 9 Mar 2011 20:53:35 +0000 Subject: Update MySql.Data.dll to version 6.3.6. This version fixes a bug so that MySqlCommand.CommandTimeout = 0 now correctly sets an infinite command timeout. This might help with failures on long-running migrations. The mysql.data.dll v2 is used from the mysql package (as opposed to v4). The v4 version (probably standing for NET 4.0) does not work under mono 2.6.7, which is still commonly used. --- bin/MySql.Data.dll | Bin 360448 -> 353792 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll index c28c618..992aa56 100644 Binary files a/bin/MySql.Data.dll and b/bin/MySql.Data.dll differ -- cgit v1.1 From 9456bb77fbf794bb6fc2808e6cfd69c9bb1d1326 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 9 Mar 2011 23:25:24 +0000 Subject: Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement. --- bin/nunit.framework.dll | Bin 77824 -> 135168 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/nunit.framework.dll b/bin/nunit.framework.dll index d68d9f2..875e098 100644 Binary files a/bin/nunit.framework.dll and b/bin/nunit.framework.dll differ -- cgit v1.1 From f4a30f3a234e8fbc946bf3fd5a1f96a39d9e79ea Mon Sep 17 00:00:00 2001 From: BlueWall Date: Fri, 18 Mar 2011 12:12:08 -0400 Subject: Upgrade SQLite: Fixes metadata issues. Tested on Linux and Windows - may fix issues seen on OSx as well. --- bin/libsqlite3.so.0 | Bin 0 -> 871398 bytes bin/libsqlite3.txt | 1 + bin/sqlite-3.6.21.so | Bin 392316 -> 0 bytes 3 files changed, 1 insertion(+) create mode 100755 bin/libsqlite3.so.0 create mode 100644 bin/libsqlite3.txt delete mode 100644 bin/sqlite-3.6.21.so (limited to 'bin') diff --git a/bin/libsqlite3.so.0 b/bin/libsqlite3.so.0 new file mode 100755 index 0000000..0512d8a Binary files /dev/null and b/bin/libsqlite3.so.0 differ diff --git a/bin/libsqlite3.txt b/bin/libsqlite3.txt new file mode 100644 index 0000000..8ef66bd --- /dev/null +++ b/bin/libsqlite3.txt @@ -0,0 +1 @@ +libsqlite version: 3.7.5 diff --git a/bin/sqlite-3.6.21.so b/bin/sqlite-3.6.21.so deleted file mode 100644 index 2a8f38b..0000000 Binary files a/bin/sqlite-3.6.21.so and /dev/null differ -- cgit v1.1 From 97d46648cdde5d8237d1241f3dc47fc455b35d33 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Tue, 22 Mar 2011 16:42:12 -0400 Subject: More SQLite work. --- bin/Mono.Data.Sqlite.dll.config | 4 ++++ bin/libsqlite3.so.0 | Bin 871398 -> 0 bytes bin/libsqlite3_32.so | Bin 0 -> 635852 bytes bin/libsqlite3_64.so | Bin 0 -> 783200 bytes 4 files changed, 4 insertions(+) create mode 100644 bin/Mono.Data.Sqlite.dll.config delete mode 100755 bin/libsqlite3.so.0 create mode 100755 bin/libsqlite3_32.so create mode 100755 bin/libsqlite3_64.so (limited to 'bin') diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config new file mode 100644 index 0000000..456461e --- /dev/null +++ b/bin/Mono.Data.Sqlite.dll.config @@ -0,0 +1,4 @@ + + + + diff --git a/bin/libsqlite3.so.0 b/bin/libsqlite3.so.0 deleted file mode 100755 index 0512d8a..0000000 Binary files a/bin/libsqlite3.so.0 and /dev/null differ diff --git a/bin/libsqlite3_32.so b/bin/libsqlite3_32.so new file mode 100755 index 0000000..171ffcd Binary files /dev/null and b/bin/libsqlite3_32.so differ diff --git a/bin/libsqlite3_64.so b/bin/libsqlite3_64.so new file mode 100755 index 0000000..2646a9c Binary files /dev/null and b/bin/libsqlite3_64.so differ -- cgit v1.1 From be878795aa67acb486113eb4d9cdf7154f4d8408 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Tue, 22 Mar 2011 17:36:01 -0400 Subject: Typo fix --- bin/Mono.Data.Sqlite.dll.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config index 456461e..de0c17d 100644 --- a/bin/Mono.Data.Sqlite.dll.config +++ b/bin/Mono.Data.Sqlite.dll.config @@ -1,4 +1,4 @@ - + -- cgit v1.1 From 9c979dd0fc468ec5b15bb9b3db2eae55db53c0bc Mon Sep 17 00:00:00 2001 From: Marck Date: Wed, 23 Mar 2011 08:35:39 +0100 Subject: Fix a typo in the SQLite DLL config and amend the instructions for running on Linux. Under Linux (and probably also under OSX), the operating system must be able to find the new SQLite DLL in the library search path. --- bin/Mono.Data.Sqlite.dll.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config index de0c17d..0c5e941 100644 --- a/bin/Mono.Data.Sqlite.dll.config +++ b/bin/Mono.Data.Sqlite.dll.config @@ -1,4 +1,4 @@ - + -- cgit v1.1 From fe6900b305392937bf22e54331c558cd667f9b63 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sun, 27 Mar 2011 19:38:40 -0400 Subject: Touchup for SQLite --- bin/Mono.Data.Sqlite.dll.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config index 0c5e941..b704035 100644 --- a/bin/Mono.Data.Sqlite.dll.config +++ b/bin/Mono.Data.Sqlite.dll.config @@ -1,4 +1,4 @@ - + -- cgit v1.1 From dd72a69ea54893b9d6d16f7d388e5fe12058fd9e Mon Sep 17 00:00:00 2001 From: Marck Date: Mon, 28 Mar 2011 13:11:23 +0200 Subject: More touchup for SQLite. Apply the same change to both the 32-bit and 64-bit DLL target paths. This makes the previous addition to the instructions in the README for running on Linux unnecessary. --- bin/Mono.Data.Sqlite.dll.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config index b704035..6a95476 100644 --- a/bin/Mono.Data.Sqlite.dll.config +++ b/bin/Mono.Data.Sqlite.dll.config @@ -1,4 +1,4 @@ - + -- cgit v1.1 From 2d209d3844a58a4d27fe15aa5ccd497bbd530707 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 28 Mar 2011 16:46:04 -0700 Subject: Fix mantis #5413. WARNING: new config variable in section [GridService] of the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples. --- bin/config-include/GridCommon.ini.example | 6 ++++++ bin/config-include/StandaloneCommon.ini.example | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 4dc0e53..a6fe4b1 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -45,6 +45,12 @@ ;; Directory for map tile images of linked regions ; MapTileDirectory = "./maptiles" + ; === HG ONLY === + ;; change this to the address of your Gatekeeper service + ;; (usually bundled with the rest of the services in one + ;; Robust server in port 8002, but not always) + Gatekeeper="http://mygridserver.com:8002" + [AvatarService] ; ; change this to your grid-wide grid server diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 816e9a6..995a33e 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -78,6 +78,11 @@ ;; For example: Region_Welcome_Area = "DefaultRegion, FallbackRegion" + ; === HG ONLY === + ;; change this to the address of your simulator + Gatekeeper="http://127.0.0.1:9000" + + [LibraryModule] ; Set this if you want to change the name of the OpenSim Library ;LibraryName = "My World's Library" -- cgit v1.1 From 1b1e6f78fd61b1eb22ea140ba58cf7df3829fd20 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 7 Apr 2011 21:44:54 +0100 Subject: Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and use this instead of the system one. This means that Mac OS X users can now use the standard sqlite adaptor instead of the legacy one. This is SQLite 3.7.5. I configured the build with the line CFLAGS="-Os -g -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc7400 -DSQLITE_ENABLE_COLUMN_METADATA" LDFLAGS="-arch i386 -arch x86_64 -arch ppc7400" ./configure --disable-dependency-tracking The SQLITE_ENABLE_COLUMN_METADATA flag exports the metadata symbols that modern Mono SQLite adaptors need. The -Os removes debugging symbols (as per the sqlite3 source pkg README) The other parts are to cross compile for x86_64, i386 and ppc. On Mac OS X, Mono can actually only P/INVOKE 32-bit libraries even on 64 bit platforms so i386 is being used. The dylib has not been tested on ppc. --- bin/Mono.Data.Sqlite.dll.config | 1 + bin/libsqlite3.dylib | Bin 0 -> 2175300 bytes 2 files changed, 1 insertion(+) create mode 100755 bin/libsqlite3.dylib (limited to 'bin') diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config index 6a95476..ccc0cf5 100644 --- a/bin/Mono.Data.Sqlite.dll.config +++ b/bin/Mono.Data.Sqlite.dll.config @@ -1,4 +1,5 @@ + diff --git a/bin/libsqlite3.dylib b/bin/libsqlite3.dylib new file mode 100755 index 0000000..94dcca8 Binary files /dev/null and b/bin/libsqlite3.dylib differ -- cgit v1.1 From 9d40c0dcc70462d78d6347676927b05eed245a9a Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 7 Apr 2011 23:16:36 +0100 Subject: Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X. The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator. --- bin/config-include/GridCommon.ini.example | 5 ----- bin/config-include/StandaloneCommon.ini.example | 5 ----- .../storage/SQLiteLegacyStandalone.ini | 20 -------------------- 3 files changed, 30 deletions(-) delete mode 100644 bin/config-include/storage/SQLiteLegacyStandalone.ini (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index a6fe4b1..bc8bc0f 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -6,11 +6,6 @@ ; SQLite Include-Storage = "config-include/storage/SQLiteStandalone.ini"; - ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older - ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite) - ; for more details - ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; - ; MySql ; Uncomment these lines if you want to use mysql storage ; Change the connection string to your db details diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 995a33e..d6f15bb 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -8,11 +8,6 @@ ; SQLite Include-Storage = "config-include/storage/SQLiteStandalone.ini"; - ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older - ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite) - ; for more details - ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; - ; MySql ; Uncomment these lines if you want to use mysql storage ; Change the connection string to your db details diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini deleted file mode 100644 index ffe9a70..0000000 --- a/bin/config-include/storage/SQLiteLegacyStandalone.ini +++ /dev/null @@ -1,20 +0,0 @@ -; These are the initialization settings for running OpenSim Standalone with an SQLite database - -[DatabaseService] - StorageProvider = "OpenSim.Data.SQLiteLegacy.dll" - ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True" - -[AssetService] - ConnectionString = "URI=file:Asset.db,version=3" - -[AvatarService] - ConnectionString = "URI=file:avatars.db,version=3" - -[AuthenticationService] - ConnectionString = "URI=file:auth.db,version=3" - -[UserAccountService] - ConnectionString = "URI=file:userprofiles.db,version=3" - -[FriendsService] - ConnectionString = "URI=file:friends.db,version=3" -- cgit v1.1 From 9ba787be67cc8066c05890f5bc56dfb575209b76 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 8 Apr 2011 00:33:33 +0100 Subject: Remove old SQLite library --- bin/System.Data.SQLite.dll | Bin 159232 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/System.Data.SQLite.dll (limited to 'bin') diff --git a/bin/System.Data.SQLite.dll b/bin/System.Data.SQLite.dll deleted file mode 100644 index 66f38e7..0000000 Binary files a/bin/System.Data.SQLite.dll and /dev/null differ -- cgit v1.1 From 2aa39847966fb2b5c53aee01e1477677c09d0f0a Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 8 Apr 2011 20:50:23 +0100 Subject: Update ODE for mac from source code in opensim-libs SVN library. This version is r1755 + patches as detailed in the svn logs. This brings it into line with the Windows and Linux libraries. This is a universal dylib with x86_64, i386 and ppc parts. However, even on a 64 bit Intel machine Mono can only P/INVOKE the i386 version right now. ppc is untested. The configuration used to compile was CFLAGS="-g -O2 -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc" CXXFLAGS="-g -O2 -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc" LDFLAGS="-arch i386 -arch x86_64 -arch ppc" ./configure --enable-old-trimesh --disable-asserts --enable-shared --disable-dependency-tracking --disable-demos --without-x --disable-demos --without-x is required to build ODE on Mac OS X CFLAGS, CXXFLAGS and --disable-dependency-tracking are necessary to build the universal dylib (some compilation lines use CFLAGS instead of CXXFLAGS) The other settings are tweaks for using ODE with OpenSim --- bin/libode.dylib | Bin 1024996 -> 2916380 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/libode.dylib b/bin/libode.dylib index e81f9e4..958d202 100644 Binary files a/bin/libode.dylib and b/bin/libode.dylib differ -- cgit v1.1