Merge git://opensimulator.org/git/opensim

13 files changed, 17 insertions, 30 deletions

diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
new file mode 100644
index 0000000..ccc0cf5
--- /dev/null
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -0,0 +1,5 @@
+<configuration>
+  <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" />
+  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" />
+</configuration>
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll
index c28c618..992aa56 100644
--- a/bin/MySql.Data.dll
+++ b/bin/MySql.Data.dll
diff --git a/bin/System.Data.SQLite.dll b/bin/System.Data.SQLite.dll
deleted file mode 100644
index 66f38e7..0000000
--- a/bin/System.Data.SQLite.dll
+++ /dev/null
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4dc0e53..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
@@ -45,6 +40,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..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
@@ -78,6 +73,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"
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"
diff --git a/bin/libode.dylib b/bin/libode.dylib
index e81f9e4..958d202 100644
--- a/bin/libode.dylib
+++ b/bin/libode.dylib
diff --git a/bin/libsqlite3.dylib b/bin/libsqlite3.dylib
new file mode 100755
index 0000000..94dcca8
--- /dev/null
+++ b/bin/libsqlite3.dylib
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/libsqlite3_32.so b/bin/libsqlite3_32.so
new file mode 100755
index 0000000..171ffcd
--- /dev/null
+++ b/bin/libsqlite3_32.so
diff --git a/bin/libsqlite3_64.so b/bin/libsqlite3_64.so
new file mode 100755
index 0000000..2646a9c
--- /dev/null
+++ b/bin/libsqlite3_64.so
diff --git a/bin/nunit.framework.dll b/bin/nunit.framework.dll
index d68d9f2..875e098 100644
--- a/bin/nunit.framework.dll
+++ b/bin/nunit.framework.dll
diff --git a/bin/sqlite-3.6.21.so b/bin/sqlite-3.6.21.so
deleted file mode 100644
index 2a8f38b..0000000
--- a/bin/sqlite-3.6.21.so
+++ /dev/null