Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

4 files changed, 7 insertions, 1 deletions

diff --git a/bin/Library/.keep b/bin/Library/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/Library/.keep
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index a6c089c..cdfdf4b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -13,6 +13,7 @@
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "LocalGridServicesConnector"
+    LibraryModule = true
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -26,3 +27,4 @@
 [GridService]
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
+
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index b0e2de3..1679f93 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,3 +39,7 @@
     ;;--- For MySql region storage (alternative)
         ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
         ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
+[LibraryModule]
+    ; Set this if you want to change the name of the OpenSim Library
+    ;LibraryName = "My World's Library"
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index baff811..909286c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -21,7 +21,7 @@
     HGAuthServiceInConnector = true
     HypergridServiceInConnector = true
     NeighbourServiceInConnector = true
-
+    LibraryModule = true
 
 [AssetService]
     ; For the AssetServiceInConnector