diff options
author | Melanie | 2013-02-28 21:20:07 +0000 |
---|---|---|
committer | Melanie | 2013-02-28 21:20:07 +0000 |
commit | eb9458fd7e3a9098712f501cdcf05d71f741ec14 (patch) | |
tree | 1a719b0d89f22cefd04866db162694d0eb724d8d /bin/Robust.HG.ini.example | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff) | |
download | opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
-rw-r--r-- | bin/Robust.HG.ini.example | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 53676a3..91dea8c 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -34,25 +34,12 @@ | |||
34 | ; The Robust.exe process must hvae R/W access to the location | 34 | ; The Robust.exe process must hvae R/W access to the location |
35 | ConfigDirectory = "/home/opensim/etc/Configs" | 35 | ConfigDirectory = "/home/opensim/etc/Configs" |
36 | 36 | ||
37 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} | ||
38 | ;; This is the address of the external robust server that | ||
39 | ;; runs the UserAgentsService, possibly this server. | ||
40 | ;; For example http://myworld.com:8002 | ||
41 | ;; This is a default that can be overwritten in some sections. | ||
42 | ; HomeURI = "http://127.0.0.1:8002" | ||
43 | |||
44 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} | ||
45 | ;; This is the address of the external robust server | ||
46 | ;; that runs the Gatekeeper service, possibly this server. | ||
47 | ;; For example http://myworld.com:8002 | ||
48 | ;; This is a default that can be overwritten in some sections. | ||
49 | ; GatekeeperURI = "http://127.0.0.1:8002" | ||
50 | |||
51 | [ServiceList] | 37 | [ServiceList] |
52 | 38 | ||
53 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 39 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" |
54 | InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" | 40 | InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" |
55 | VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector" | 41 | ;; Uncomment if you have set up Freeswitch (see [FreeswitchService] below) |
42 | ;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector" | ||
56 | GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector" | 43 | GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector" |
57 | GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector" | 44 | GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector" |
58 | AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" | 45 | AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" |
@@ -118,6 +105,21 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
118 | ;ConsolePass = secret | 105 | ;ConsolePass = secret |
119 | ;ConsolePort = 0 | 106 | ;ConsolePort = 0 |
120 | 107 | ||
108 | [Hypergrid] | ||
109 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} | ||
110 | ;; This is the address of the external robust server that | ||
111 | ;; runs the UserAgentsService, possibly this server. | ||
112 | ;; For example http://myworld.com:8002 | ||
113 | ;; This is a default that can be overwritten in some sections. | ||
114 | ; HomeURI = "http://127.0.0.1:8002" | ||
115 | |||
116 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} | ||
117 | ;; This is the address of the external robust server | ||
118 | ;; that runs the Gatekeeper service, possibly this server. | ||
119 | ;; For example http://myworld.com:8002 | ||
120 | ;; This is a default that can be overwritten in some sections. | ||
121 | ; GatekeeperURI = "http://127.0.0.1:8002" | ||
122 | |||
121 | [DatabaseService] | 123 | [DatabaseService] |
122 | StorageProvider = "OpenSim.Data.MySQL.dll" | 124 | StorageProvider = "OpenSim.Data.MySQL.dll" |
123 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" | 125 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" |