diff options
author | Justin Clark-Casey (justincc) | 2011-05-27 21:21:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-27 21:21:01 +0100 |
commit | b0c9696de0a4f30a4ceab030f369adce57c9bff4 (patch) | |
tree | 496b6e0a7d132f1bcd7c1d2a1bb6085246e4b16f /bin | |
parent | Make sure culture is en-US when saving archive related xml. (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-b0c9696de0a4f30a4ceab030f369adce57c9bff4.zip opensim-SC-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.gz opensim-SC-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.bz2 opensim-SC-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 6 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 3 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 5 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 3 |
4 files changed, 15 insertions, 2 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 486ba76..29f0de3 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -46,6 +46,12 @@ | |||
46 | ;; Robust server in port 8002, but not always) | 46 | ;; Robust server in port 8002, but not always) |
47 | Gatekeeper="http://mygridserver.com:8002" | 47 | Gatekeeper="http://mygridserver.com:8002" |
48 | 48 | ||
49 | [Messaging] | ||
50 | ;; change this to the address of your Gatekeeper service | ||
51 | ;; (usually bundled with the rest of the services in one | ||
52 | ;; Robust server in port 8002, but not always) | ||
53 | Gatekeeper = "http://mygridserver.com:8002" | ||
54 | |||
49 | [AvatarService] | 55 | [AvatarService] |
50 | ; | 56 | ; |
51 | ; change this to your grid-wide grid server | 57 | ; change this to your grid-wide grid server |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 72b7412..510a315 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -69,7 +69,8 @@ | |||
69 | Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" | 69 | Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" |
70 | 70 | ||
71 | [Messaging] | 71 | [Messaging] |
72 | MessageTransferModule = HGMessageTransferModule | 72 | MessageTransferModule = HGMessageTransferModule |
73 | LureModule = HGLureModule | ||
73 | 74 | ||
74 | [HGInstantMessageService] | 75 | [HGInstantMessageService] |
75 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" | 76 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index df93cee..931a77b 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -70,6 +70,11 @@ | |||
70 | ;; change this to the address of your simulator | 70 | ;; change this to the address of your simulator |
71 | Gatekeeper="http://127.0.0.1:9000" | 71 | Gatekeeper="http://127.0.0.1:9000" |
72 | 72 | ||
73 | [Messaging] | ||
74 | ; === HG ONLY === | ||
75 | ;; change this to the address of your simulator | ||
76 | Gatekeeper = "http://127.0.0.1:9000" | ||
77 | |||
73 | [LibraryModule] | 78 | [LibraryModule] |
74 | ; Set this if you want to change the name of the OpenSim Library | 79 | ; Set this if you want to change the name of the OpenSim Library |
75 | ;LibraryName = "My World's Library" | 80 | ;LibraryName = "My World's Library" |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 7d1ff60..44ca3ac 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -36,7 +36,8 @@ | |||
36 | Module = "BasicProfileModule" | 36 | Module = "BasicProfileModule" |
37 | 37 | ||
38 | [Messaging] | 38 | [Messaging] |
39 | MessageTransferModule = HGMessageTransferModule | 39 | MessageTransferModule = HGMessageTransferModule |
40 | LureModule = HGLureModule | ||
40 | 41 | ||
41 | [SimulationDataStore] | 42 | [SimulationDataStore] |
42 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 43 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |