diff options
author | Melanie | 2009-12-24 16:45:27 +0000 |
---|---|---|
committer | Melanie | 2009-12-24 16:45:27 +0000 |
commit | 0054afd39b7b4a7bad62ae1cabdecd14f64422d0 (patch) | |
tree | d09e1bfaf1359bc8d00dde145938cfcc52018e70 /bin | |
parent | Add the body to the LSL List Size property (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-0054afd39b7b4a7bad62ae1cabdecd14f64422d0.zip opensim-SC-0054afd39b7b4a7bad62ae1cabdecd14f64422d0.tar.gz opensim-SC-0054afd39b7b4a7bad62ae1cabdecd14f64422d0.tar.bz2 opensim-SC-0054afd39b7b4a7bad62ae1cabdecd14f64422d0.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | bin/Library/.keep | 0 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 2 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 4 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 2 |
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 @@ | |||
13 | NeighbourServices = "LocalNeighbourServicesConnector" | 13 | NeighbourServices = "LocalNeighbourServicesConnector" |
14 | AuthorizationServices = "LocalAuthorizationServicesConnector" | 14 | AuthorizationServices = "LocalAuthorizationServicesConnector" |
15 | GridServices = "LocalGridServicesConnector" | 15 | GridServices = "LocalGridServicesConnector" |
16 | LibraryModule = true | ||
16 | 17 | ||
17 | [AssetService] | 18 | [AssetService] |
18 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 19 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
@@ -26,3 +27,4 @@ | |||
26 | [GridService] | 27 | [GridService] |
27 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 28 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
28 | Realm = "regions" | 29 | Realm = "regions" |
30 | |||
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 @@ | |||
39 | ;;--- For MySql region storage (alternative) | 39 | ;;--- For MySql region storage (alternative) |
40 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | 40 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" |
41 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" | 41 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" |
42 | |||
43 | [LibraryModule] | ||
44 | ; Set this if you want to change the name of the OpenSim Library | ||
45 | ;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 @@ | |||
21 | HGAuthServiceInConnector = true | 21 | HGAuthServiceInConnector = true |
22 | HypergridServiceInConnector = true | 22 | HypergridServiceInConnector = true |
23 | NeighbourServiceInConnector = true | 23 | NeighbourServiceInConnector = true |
24 | 24 | LibraryModule = true | |
25 | 25 | ||
26 | [AssetService] | 26 | [AssetService] |
27 | ; For the AssetServiceInConnector | 27 | ; For the AssetServiceInConnector |