aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-03 13:36:35 -0700
committerJohn Hurliman2010-09-03 13:36:35 -0700
commit4f79143f3f058b0570c073b668f4ea088e541a43 (patch)
treef95d821dc052c8a66b66a49fe413c6cce639dec3 /bin
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.zip
opensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.tar.gz
opensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.tar.bz2
opensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.tar.xz
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example11
-rw-r--r--bin/config-include/HyperSimianGrid.ini77
2 files changed, 83 insertions, 5 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index dac6477..71c7e55 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1299,11 +1299,12 @@
1299[Architecture] 1299[Architecture]
1300 ; Choose exactly one and only one of the architectures below. 1300 ; Choose exactly one and only one of the architectures below.
1301 1301
1302 Include-Standalone = "config-include/Standalone.ini" 1302 Include-Standalone = "config-include/Standalone.ini"
1303 ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini" 1303 ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
1304 ;Include-Grid = "config-include/Grid.ini" 1304 ;Include-Grid = "config-include/Grid.ini"
1305 ;Include-HGGrid = "config-include/GridHypergrid.ini" 1305 ;Include-HGGrid = "config-include/GridHypergrid.ini"
1306 ;Include-SimianGrid = "config-include/SimianGrid.ini" 1306 ;Include-SimianGrid = "config-include/SimianGrid.ini"
1307 ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
1307 1308
1308 ; Then choose 1309 ; Then choose
1309 ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR 1310 ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
new file mode 100644
index 0000000..87ffe69
--- /dev/null
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -0,0 +1,77 @@
1;;
2;; Please don't change this file.
3;; All optional settings are in GridCommon.ini.example,
4;; which you can copy and change.
5;;
6
7;;
8;; In GridCommon.ini, these are the URLs you would use if SimianGrid is
9;; installed at http://www.mygrid.com/Grid/
10;;
11; AssetServerURI = "http://www.mygrid.com/Grid/?id="
12; InventoryServerURI = "http://www.mygrid.com/Grid/"
13; AvatarServerURI = "http://www.mygrid.com/Grid/"
14; PresenceServerURI = "http://www.mygrid.com/Grid/"
15; UserAccountServerURI = "http://www.mygrid.com/Grid/"
16; AuthenticationServerURI = "http://www.mygrid.com/Grid/"
17; FriendsServerURI = "http://www.mygrid.com/Grid/"
18; GroupsServerURI = "http://www.mygrid.com/Grid/"
19
20[Includes]
21 Include-Common = "config-include/GridCommon.ini"
22
23[Modules]
24 GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
25 PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
26 UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
27 AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
28 AssetServices = "HGAssetBroker"
29 InventoryServices = "HGInventoryBroker"
30 AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
31
32 NeighbourServices = "RemoteNeighbourServicesConnector"
33 SimulationServices = "RemoteSimulationConnectorModule"
34 EntityTransferModule = "HGEntityTransferModule"
35 InventoryAccessModule = "HGInventoryAccessModule"
36
37 LandServiceInConnector = true
38 NeighbourServiceInConnector = true
39 SimulationServiceInConnector = true
40 LibraryModule = false
41
42 AssetCaching = "FlotsamAssetCache"
43
44[Friends]
45 Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
46
47[GridService]
48 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
49 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
50
51 AllowHypergridMapSearch = true
52
53[LibraryService]
54 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
55 LibraryName = "OpenSim Library"
56 DefaultLibrary = "./inventory/Libraries.xml"
57
58[AssetService]
59 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
60 LocalGridAssetService = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
61 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
62 AssetLoaderArgs = "assets/AssetSets.xml"
63
64[InventoryService]
65 LocalGridInventoryService = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
66
67[Groups]
68 Enabled = true
69 Module = GroupsModule
70 DebugEnabled = false
71 NoticesEnabled = true
72 MessagingModule = GroupsMessagingModule
73 MessagingEnabled = true
74 ServicesConnectorModule = SimianGroupsServicesConnector
75
76[Profiles]
77 Module = SimianProfiles