diff options
author | Diva Canto | 2010-08-20 11:09:21 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-20 11:09:21 -0700 |
commit | 4463ebfbc2365ecfdaff84d42fa51d5e999e8cbe (patch) | |
tree | 9016465f30bd1bcbcf5ad35bd9d0393fe5b5fc55 | |
parent | Unit test breakage fix. (diff) | |
parent | Make some small corrections to ini.example file changes. These are not funct... (diff) | |
download | opensim-SC_OLD-4463ebfbc2365ecfdaff84d42fa51d5e999e8cbe.zip opensim-SC_OLD-4463ebfbc2365ecfdaff84d42fa51d5e999e8cbe.tar.gz opensim-SC_OLD-4463ebfbc2365ecfdaff84d42fa51d5e999e8cbe.tar.bz2 opensim-SC_OLD-4463ebfbc2365ecfdaff84d42fa51d5e999e8cbe.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 52 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 18 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 72 | ||||
-rw-r--r-- | bin/Robust.ini.example | 37 |
4 files changed, 109 insertions, 70 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 2105f3c..2b3d2a9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |||
@@ -51,10 +51,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
51 | m_scene.RegisterModuleInterface<IDialogModule>(this); | 51 | m_scene.RegisterModuleInterface<IDialogModule>(this); |
52 | 52 | ||
53 | m_scene.AddCommand( | 53 | m_scene.AddCommand( |
54 | this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand); | 54 | this, "alert", "alert <first> <last> <message>", |
55 | "Send an alert to a user", | ||
56 | HandleAlertConsoleCommand); | ||
55 | 57 | ||
56 | m_scene.AddCommand( | 58 | m_scene.AddCommand( |
57 | this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand); | 59 | this, "alert general", "alert [general] <message>", |
60 | "Send an alert to everyone", | ||
61 | "If keyword 'general' is omitted, then <message> must be surrounded by quotation marks.", | ||
62 | HandleAlertConsoleCommand); | ||
58 | } | 63 | } |
59 | 64 | ||
60 | public void PostInitialise() {} | 65 | public void PostInitialise() {} |
@@ -173,20 +178,49 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
173 | if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene) | 178 | if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene) |
174 | return; | 179 | return; |
175 | 180 | ||
176 | if (cmdparams[1] == "general") | 181 | bool isGeneral = false; |
182 | string firstName = string.Empty; | ||
183 | string lastName = string.Empty; | ||
184 | string message = string.Empty; | ||
185 | |||
186 | if (cmdparams.Length > 1) | ||
187 | { | ||
188 | firstName = cmdparams[1]; | ||
189 | isGeneral = firstName.ToLower().Equals("general"); | ||
190 | } | ||
191 | if (cmdparams.Length == 2 && !isGeneral) | ||
192 | { | ||
193 | // alert "message" | ||
194 | message = cmdparams[1]; | ||
195 | isGeneral = true; | ||
196 | } | ||
197 | else if (cmdparams.Length > 2 && isGeneral) | ||
198 | { | ||
199 | // alert general <message> | ||
200 | message = CombineParams(cmdparams, 2); | ||
201 | } | ||
202 | else if (cmdparams.Length > 3) | ||
177 | { | 203 | { |
178 | string message = CombineParams(cmdparams, 2); | 204 | // alert <first> <last> <message> |
205 | lastName = cmdparams[2]; | ||
206 | message = CombineParams(cmdparams, 3); | ||
207 | } | ||
208 | else | ||
209 | { | ||
210 | OpenSim.Framework.Console.MainConsole.Instance.Output( | ||
211 | "Usage: alert \"message\" | alert general <message> | alert <first> <last> <message>"); | ||
212 | return; | ||
213 | } | ||
179 | 214 | ||
215 | if (isGeneral) | ||
216 | { | ||
180 | m_log.InfoFormat( | 217 | m_log.InfoFormat( |
181 | "[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message); | 218 | "[DIALOG]: Sending general alert in region {0} with message {1}", |
219 | m_scene.RegionInfo.RegionName, message); | ||
182 | SendGeneralAlert(message); | 220 | SendGeneralAlert(message); |
183 | } | 221 | } |
184 | else | 222 | else |
185 | { | 223 | { |
186 | string firstName = cmdparams[1]; | ||
187 | string lastName = cmdparams[2]; | ||
188 | string message = CombineParams(cmdparams, 3); | ||
189 | |||
190 | m_log.InfoFormat( | 224 | m_log.InfoFormat( |
191 | "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", | 225 | "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", |
192 | m_scene.RegionInfo.RegionName, firstName, lastName, message); | 226 | m_scene.RegionInfo.RegionName, firstName, lastName, message); |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index 87a0a8d..fd0e879 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
100 | bool enabled = false; | 100 | bool enabled = false; |
101 | IConfig cfg = null; | 101 | IConfig cfg = null; |
102 | IConfig httpcfg = null; | 102 | IConfig httpcfg = null; |
103 | IConfig startupcfg = null; | 103 | // IConfig startupcfg = null; |
104 | try | 104 | try |
105 | { | 105 | { |
106 | cfg = config.Configs["OpenGridProtocol"]; | 106 | cfg = config.Configs["OpenGridProtocol"]; |
@@ -117,14 +117,14 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
117 | { | 117 | { |
118 | 118 | ||
119 | } | 119 | } |
120 | try | 120 | // try |
121 | { | 121 | // { |
122 | startupcfg = config.Configs["Startup"]; | 122 | // startupcfg = config.Configs["Startup"]; |
123 | } | 123 | // } |
124 | catch (NullReferenceException) | 124 | // catch (NullReferenceException) |
125 | { | 125 | // { |
126 | 126 | // | |
127 | } | 127 | // } |
128 | 128 | ||
129 | // if (startupcfg != null) | 129 | // if (startupcfg != null) |
130 | // { | 130 | // { |
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 15b4d39..122ba2e 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -1,15 +1,25 @@ | |||
1 | ;; Configurations for enabling HG1.5 | 1 | ; * Run |
2 | ;; | 2 | ; * $ Robust.exe -inifile Robust.HG.ini |
3 | ;; Run | 3 | ; * |
4 | ;; $ Robust.exe -inifile Robust.HG.ini | ||
5 | |||
6 | ;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService | ||
7 | ;; OpenSim.Server.Handlers.dll:UserAgentService | ||
8 | ;; Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and | ||
9 | ;; OpenSim.Server.Handlers.dll:XInventoryInConnector | ||
10 | ;; are started in port 8002, outside the firewall | ||
11 | ;; | ||
12 | 4 | ||
5 | ; * Configurations for enabling HG1.5 | ||
6 | ; * | ||
7 | ; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService | ||
8 | ; * OpenSim.Server.Handlers.dll:UserAgentService | ||
9 | ; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and | ||
10 | ; * OpenSim.Server.Handlers.dll:XInventoryInConnector | ||
11 | ; * are started in port 8002, outside the firewall | ||
12 | ; * | ||
13 | ; * The startup section lists all the connectors to start up in this server | ||
14 | ; * instance. This may be only one, or it may be the entire server suite. | ||
15 | ; * Multiple connectors should be separated by commas. | ||
16 | ; * | ||
17 | ; * These are the IN connectors the server uses, the in connectors | ||
18 | ; * read this config file and load the needed service and database connectors | ||
19 | ; * | ||
20 | ; * The full syntax of a connector string is: | ||
21 | ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>] | ||
22 | ; * | ||
13 | [Startup] | 23 | [Startup] |
14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 24 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" |
15 | 25 | ||
@@ -52,10 +62,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
52 | ; * | 62 | ; * |
53 | [GridService] | 63 | [GridService] |
54 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 64 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
55 | Realm = "regions" | 65 | ; Realm = "regions" |
56 | ; AllowDuplicateNames = "True" | 66 | ; AllowDuplicateNames = "True" |
57 | ; Check4096 = "False" | 67 | ; Check4096 = "False" |
58 | 68 | ||
59 | ;; Next, we can specify properties of regions, including default and fallback regions | 69 | ;; Next, we can specify properties of regions, including default and fallback regions |
60 | ;; The syntax is: Region_<RegionName> = "<flags>" | 70 | ;; The syntax is: Region_<RegionName> = "<flags>" |
61 | ;; or: Region_<RegionID> = "<flags>" | 71 | ;; or: Region_<RegionID> = "<flags>" |
@@ -70,12 +80,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
70 | 80 | ||
71 | ; * This is the new style authentication service. Currently, only MySQL | 81 | ; * This is the new style authentication service. Currently, only MySQL |
72 | ; * is implemented. "Realm" is the table that is used for user lookup. | 82 | ; * is implemented. "Realm" is the table that is used for user lookup. |
73 | ; * By setting it to "users", you can use the old style users table | 83 | ; * It defaults to "useraccounts", which uses the new style. |
74 | ; * as an authentication source. | 84 | ; * Realm = "users" will use the legacy tables as an authentication source |
75 | ; * | 85 | ; * |
76 | [AuthenticationService] | 86 | [AuthenticationService] |
77 | ; for the server connector | 87 | ; for the server connector |
78 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 88 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
89 | ; Realm = "useraccounts" | ||
79 | 90 | ||
80 | [OpenIdService] | 91 | [OpenIdService] |
81 | ; for the server connector | 92 | ; for the server connector |
@@ -89,7 +100,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
89 | [UserAccountService] | 100 | [UserAccountService] |
90 | ; for the server connector | 101 | ; for the server connector |
91 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 102 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
92 | ;; These are for creating new accounts by the service | 103 | ; Realm = "usersaccounts" |
104 | |||
105 | ; These are for creating new accounts by the service | ||
93 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 106 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
94 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 107 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
95 | GridService = "OpenSim.Services.GridService.dll:GridService" | 108 | GridService = "OpenSim.Services.GridService.dll:GridService" |
@@ -161,32 +174,25 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
161 | 174 | ||
162 | ; login page: optional: if it exists it will be used to tell the client to use | 175 | ; login page: optional: if it exists it will be used to tell the client to use |
163 | ; this as splash page | 176 | ; this as splash page |
164 | ; currently unused | ||
165 | ;welcome = http://127.0.0.1/welcome | 177 | ;welcome = http://127.0.0.1/welcome |
166 | 178 | ||
167 | ; helper uri: optional: if it exists if will be used to tell the client to use | 179 | ; helper uri: optional: if it exists if will be used to tell the client to use |
168 | ; this for all economy related things | 180 | ; this for all economy related things |
169 | ; currently unused | ||
170 | ;economy = http://127.0.0.1:9000/ | 181 | ;economy = http://127.0.0.1:9000/ |
171 | 182 | ||
172 | ; web page of grid: optional: page providing further information about your grid | 183 | ; web page of grid: optional: page providing further information about your grid |
173 | ; currently unused | ||
174 | ;about = http://127.0.0.1/about/ | 184 | ;about = http://127.0.0.1/about/ |
175 | 185 | ||
176 | ; account creation: optional: page providing further information about obtaining | 186 | ; account creation: optional: page providing further information about obtaining |
177 | ; a user account on your grid | 187 | ; a user account on your grid |
178 | ; currently unused | ||
179 | ;register = http://127.0.0.1/register | 188 | ;register = http://127.0.0.1/register |
180 | 189 | ||
181 | ; help: optional: page providing further assistance for users of your grid | 190 | ; help: optional: page providing further assistance for users of your grid |
182 | ; currently unused | ||
183 | ;help = http://127.0.0.1/help | 191 | ;help = http://127.0.0.1/help |
184 | 192 | ||
185 | ; password help: optional: page providing password assistance for users of your grid | 193 | ; password help: optional: page providing password assistance for users of your grid |
186 | ; currently unused | ||
187 | ;password = http://127.0.0.1/password | 194 | ;password = http://127.0.0.1/password |
188 | 195 | ||
189 | |||
190 | [GatekeeperService] | 196 | [GatekeeperService] |
191 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 197 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" |
192 | ;; for the service | 198 | ;; for the service |
@@ -200,9 +206,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
200 | ; CHANGE THIS | 206 | ; CHANGE THIS |
201 | ExternalName = "http://127.0.0.1:8002" | 207 | ExternalName = "http://127.0.0.1:8002" |
202 | 208 | ||
203 | ; Does this grid allow incoming links to any region in it? | 209 | ; Does this grid allow incoming links to any region in it? |
204 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | 210 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section |
205 | AllowTeleportsToAnyRegion = true | 211 | AllowTeleportsToAnyRegion = true |
206 | 212 | ||
207 | [UserAgentService] | 213 | [UserAgentService] |
208 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" | 214 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" |
@@ -211,12 +217,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
211 | GridService = "OpenSim.Services.GridService.dll:GridService" | 217 | GridService = "OpenSim.Services.GridService.dll:GridService" |
212 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 218 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" |
213 | 219 | ||
214 | ;; The interface that local users get when they are in other grids. | 220 | ; * The interface that local users get when they are in other grids. |
215 | ;; This restricts the inventory operations while in other grids. | 221 | ; * This restricts the inventory operations while in other grids. |
216 | ;; Still not completely safe, especially if users perform inventory operations | 222 | ; * Still not completely safe, especially if users perform inventory operations |
217 | ;; while in those grids. The more the user accesses his/her inventory, the more | 223 | ; * while in those grids. The more the user accesses his/her inventory, the more |
218 | ;; those simulators will know about the user's inventory. | 224 | ; * those simulators will know about the user's inventory. |
225 | ; * | ||
219 | [HGInventoryService] | 226 | [HGInventoryService] |
220 | ; For the InventoryServiceInConnector | 227 | ; For the InventoryServiceInConnector |
221 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" | 228 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" |
222 | |||
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 96dfc01..0353eec 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -1,16 +1,18 @@ | |||
1 | ; * Run | ||
2 | ; * $ Robust.exe -inifile Robust.ini | ||
3 | ; * | ||
4 | |||
1 | ; * The startup section lists all the connectors to start up in this server | 5 | ; * The startup section lists all the connectors to start up in this server |
2 | ; * instance. This may be only one, or it may be the entire server suite. | 6 | ; * instance. This may be only one, or it may be the entire server suite. |
3 | ; * Multiple connectors should be seaprated by commas. | 7 | ; * Multiple connectors should be separated by commas. |
4 | ; * The startup section lists all the connectors to start up in this server | ||
5 | ; * instance. This may be only one, or it may be the entire server suite. | ||
6 | ; * Multiple connectors should be seaprated by commas. | ||
7 | ; * | 8 | ; * |
8 | ; * These are the IN connectors the server uses, the in connectors | 9 | ; * These are the IN connectors the server uses, the in connectors |
9 | ; * read this config file and load the needed service and database connectors | 10 | ; * read this config file and load the needed service and database connectors |
10 | ; * | 11 | ; * |
12 | ; * The full syntax of a connector string is: | ||
13 | ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>] | ||
11 | ; * | 14 | ; * |
12 | [Startup] | 15 | [Startup] |
13 | |||
14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" | 16 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" |
15 | 17 | ||
16 | ; * This is common for all services, it's the network setup for the entire | 18 | ; * This is common for all services, it's the network setup for the entire |
@@ -30,7 +32,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
30 | StorageProvider = "OpenSim.Data.MySQL.dll" | 32 | StorageProvider = "OpenSim.Data.MySQL.dll" |
31 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" | 33 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" |
32 | 34 | ||
33 | |||
34 | ; * As an example, the below configuration precisely mimicks the legacy | 35 | ; * As an example, the below configuration precisely mimicks the legacy |
35 | ; * asset server. It is read by the asset IN connector (defined above) | 36 | ; * asset server. It is read by the asset IN connector (defined above) |
36 | ; * and it then loads the OUT connector (a local database module). That, | 37 | ; * and it then loads the OUT connector (a local database module). That, |
@@ -54,8 +55,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
54 | ; * | 55 | ; * |
55 | [GridService] | 56 | [GridService] |
56 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 57 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
57 | Realm = "regions" | 58 | ; Realm = "regions" |
58 | ; AllowDuplicateNames = "True" | 59 | ; AllowDuplicateNames = "True" |
60 | ; Check4096 = "False" | ||
61 | |||
59 | ;; Next, we can specify properties of regions, including default and fallback regions | 62 | ;; Next, we can specify properties of regions, including default and fallback regions |
60 | ;; The syntax is: Region_<RegionName> = "<flags>" | 63 | ;; The syntax is: Region_<RegionName> = "<flags>" |
61 | ;; or: Region_<RegionID> = "<flags>" | 64 | ;; or: Region_<RegionID> = "<flags>" |
@@ -70,8 +73,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
70 | 73 | ||
71 | ; * This is the new style authentication service. Currently, only MySQL | 74 | ; * This is the new style authentication service. Currently, only MySQL |
72 | ; * is implemented. "Realm" is the table that is used for user lookup. | 75 | ; * is implemented. "Realm" is the table that is used for user lookup. |
73 | ; * By setting it to "users", you can use the old style users table | 76 | ; * It defaults to "users", which uses the legacy tables as an |
74 | ; * as an authentication source. | 77 | ; * authentication source. |
75 | ; * | 78 | ; * |
76 | [AuthenticationService] | 79 | [AuthenticationService] |
77 | ; for the server connector | 80 | ; for the server connector |
@@ -82,15 +85,17 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
82 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 85 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
83 | UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 86 | UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
84 | 87 | ||
85 | ; * This is the new style user service. | 88 | ; * This is the new style authentication service. Currently, only MySQL |
86 | ; * "Realm" is the table that is used for user lookup. | 89 | ; * is implemented. "Realm" is the table that is used for user lookup. |
87 | ; * It defaults to "users", which uses the legacy tables | 90 | ; * It defaults to "useraccounts", which uses the new style. |
91 | ; * Realm = "users" will use the legacy tables as an authentication source | ||
88 | ; * | 92 | ; * |
89 | [UserAccountService] | 93 | [UserAccountService] |
90 | ; for the server connector | 94 | ; for the server connector |
91 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 95 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
92 | ; Realm = "useraccounts" | 96 | ; Realm = "useraccounts" |
93 | ;; These are for creating new accounts by the service | 97 | |
98 | ; These are for creating new accounts by the service | ||
94 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 99 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
95 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 100 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
96 | GridService = "OpenSim.Services.GridService.dll:GridService" | 101 | GridService = "OpenSim.Services.GridService.dll:GridService" |
@@ -158,27 +163,21 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
158 | 163 | ||
159 | ; login page: optional: if it exists it will be used to tell the client to use | 164 | ; login page: optional: if it exists it will be used to tell the client to use |
160 | ; this as splash page | 165 | ; this as splash page |
161 | ; currently unused | ||
162 | ;welcome = http://127.0.0.1/welcome | 166 | ;welcome = http://127.0.0.1/welcome |
163 | 167 | ||
164 | ; helper uri: optional: if it exists if will be used to tell the client to use | 168 | ; helper uri: optional: if it exists if will be used to tell the client to use |
165 | ; this for all economy related things | 169 | ; this for all economy related things |
166 | ; currently unused | ||
167 | ;economy = http://127.0.0.1:9000/ | 170 | ;economy = http://127.0.0.1:9000/ |
168 | 171 | ||
169 | ; web page of grid: optional: page providing further information about your grid | 172 | ; web page of grid: optional: page providing further information about your grid |
170 | ; currently unused | ||
171 | ;about = http://127.0.0.1/about/ | 173 | ;about = http://127.0.0.1/about/ |
172 | 174 | ||
173 | ; account creation: optional: page providing further information about obtaining | 175 | ; account creation: optional: page providing further information about obtaining |
174 | ; a user account on your grid | 176 | ; a user account on your grid |
175 | ; currently unused | ||
176 | ;register = http://127.0.0.1/register | 177 | ;register = http://127.0.0.1/register |
177 | 178 | ||
178 | ; help: optional: page providing further assistance for users of your grid | 179 | ; help: optional: page providing further assistance for users of your grid |
179 | ; currently unused | ||
180 | ;help = http://127.0.0.1/help | 180 | ;help = http://127.0.0.1/help |
181 | 181 | ||
182 | ; password help: optional: page providing password assistance for users of your grid | 182 | ; password help: optional: page providing password assistance for users of your grid |
183 | ; currently unused | ||
184 | ;password = http://127.0.0.1/password | 183 | ;password = http://127.0.0.1/password |