aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-20 18:25:44 +0100
committerJustin Clark-Casey (justincc)2010-08-20 18:25:44 +0100
commita87840bd1c60cc8b587245d89e77a52cd8eccf08 (patch)
tree0cb9fe2e45dac7ad7d98a4da79f6a3db6f93b8e9
parentRobust.ini.example and Robust.HG.ini.example default: corrected comment about... (diff)
downloadopensim-SC-a87840bd1c60cc8b587245d89e77a52cd8eccf08.zip
opensim-SC-a87840bd1c60cc8b587245d89e77a52cd8eccf08.tar.gz
opensim-SC-a87840bd1c60cc8b587245d89e77a52cd8eccf08.tar.bz2
opensim-SC-a87840bd1c60cc8b587245d89e77a52cd8eccf08.tar.xz
Make some small corrections to ini.example file changes. These are not functional changes.
-rw-r--r--bin/Robust.HG.ini.example16
-rw-r--r--bin/Robust.ini.example16
2 files changed, 12 insertions, 20 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index b68f65d..122ba2e 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -1,6 +1,7 @@
1; * Run 1; * Run
2; * $ Robust.exe -inifile Robust.HG.ini 2; * $ Robust.exe -inifile Robust.HG.ini
3; * 3; *
4
4; * Configurations for enabling HG1.5 5; * Configurations for enabling HG1.5
5; * 6; *
6; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService 7; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
@@ -17,9 +18,8 @@
17; * read this config file and load the needed service and database connectors 18; * read this config file and load the needed service and database connectors
18; * 19; *
19; * The full syntax of a connector string is: 20; * The full syntax of a connector string is:
20; * [[<ConfigName>@]<port>/]<class name>[:<dll name>] 21; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
21; * 22; *
22
23[Startup] 23[Startup]
24ServiceConnectors = "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" 24ServiceConnectors = "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"
25 25
@@ -100,12 +100,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
100[UserAccountService] 100[UserAccountService]
101 ; for the server connector 101 ; for the server connector
102 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 102 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
103 ; Realm = "users" 103 ; Realm = "usersaccounts"
104
104 ; These are for creating new accounts by the service 105 ; These are for creating new accounts by the service
105 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 106 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
106 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 107 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
107 GridService = "OpenSim.Services.GridService.dll:GridService" 108 GridService = "OpenSim.Services.GridService.dll:GridService"
108 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 109 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
110
109[GridUserService] 111[GridUserService]
110 ; for the server connector 112 ; for the server connector
111 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" 113 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
@@ -142,7 +144,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
142 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 144 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
143 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 145 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
144 146
145 WelcomeMessage = "Welcome to OpenSim!" 147 WelcomeMessage = "Welcome, Avatar!"
146 AllowRemoteSetLoginLevel = "false" 148 AllowRemoteSetLoginLevel = "false"
147 149
148 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) 150 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
@@ -172,29 +174,23 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
172 174
173 ; 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
174 ; this as splash page 176 ; this as splash page
175 ; currently unused
176 ;welcome = http://127.0.0.1/welcome 177 ;welcome = http://127.0.0.1/welcome
177 178
178 ; 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
179 ; this for all economy related things 180 ; this for all economy related things
180 ; currently unused
181 ;economy = http://127.0.0.1:9000/ 181 ;economy = http://127.0.0.1:9000/
182 182
183 ; 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
184 ; currently unused
185 ;about = http://127.0.0.1/about/ 184 ;about = http://127.0.0.1/about/
186 185
187 ; account creation: optional: page providing further information about obtaining 186 ; account creation: optional: page providing further information about obtaining
188 ; a user account on your grid 187 ; a user account on your grid
189 ; currently unused
190 ;register = http://127.0.0.1/register 188 ;register = http://127.0.0.1/register
191 189
192 ; help: optional: page providing further assistance for users of your grid 190 ; help: optional: page providing further assistance for users of your grid
193 ; currently unused
194 ;help = http://127.0.0.1/help 191 ;help = http://127.0.0.1/help
195 192
196 ; 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
197 ; currently unused
198 ;password = http://127.0.0.1/password 194 ;password = http://127.0.0.1/password
199 195
200[GatekeeperService] 196[GatekeeperService]
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index a940cc8..0353eec 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -1,6 +1,7 @@
1; * Run 1; * Run
2; * $ Robust.exe -inifile Robust.ini 2; * $ Robust.exe -inifile Robust.ini
3; * 3; *
4
4; * 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
5; * 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.
6; * Multiple connectors should be separated by commas. 7; * Multiple connectors should be separated by commas.
@@ -9,11 +10,9 @@
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; *
11; * The full syntax of a connector string is: 12; * The full syntax of a connector string is:
12; * [[<ConfigName>@]<port>/]<class name>[:<dll name>] 13; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
13; * 14; *
14
15[Startup] 15[Startup]
16
17ServiceConnectors = "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" 16ServiceConnectors = "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"
18 17
19; * 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
@@ -58,6 +57,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
58 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 57 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
59 ; Realm = "regions" 58 ; Realm = "regions"
60 ; AllowDuplicateNames = "True" 59 ; AllowDuplicateNames = "True"
60 ; Check4096 = "False"
61
61 ;; 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
62 ;; The syntax is: Region_<RegionName> = "<flags>" 63 ;; The syntax is: Region_<RegionName> = "<flags>"
63 ;; or: Region_<RegionID> = "<flags>" 64 ;; or: Region_<RegionID> = "<flags>"
@@ -93,7 +94,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
93 ; for the server connector 94 ; for the server connector
94 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 95 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
95 ; Realm = "useraccounts" 96 ; Realm = "useraccounts"
96 ;; These are for creating new accounts by the service 97
98 ; These are for creating new accounts by the service
97 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 99 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
98 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 100 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
99 GridService = "OpenSim.Services.GridService.dll:GridService" 101 GridService = "OpenSim.Services.GridService.dll:GridService"
@@ -161,27 +163,21 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
161 163
162 ; 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
163 ; this as splash page 165 ; this as splash page
164 ; currently unused
165 ;welcome = http://127.0.0.1/welcome 166 ;welcome = http://127.0.0.1/welcome
166 167
167 ; 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
168 ; this for all economy related things 169 ; this for all economy related things
169 ; currently unused
170 ;economy = http://127.0.0.1:9000/ 170 ;economy = http://127.0.0.1:9000/
171 171
172 ; 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
173 ; currently unused
174 ;about = http://127.0.0.1/about/ 173 ;about = http://127.0.0.1/about/
175 174
176 ; account creation: optional: page providing further information about obtaining 175 ; account creation: optional: page providing further information about obtaining
177 ; a user account on your grid 176 ; a user account on your grid
178 ; currently unused
179 ;register = http://127.0.0.1/register 177 ;register = http://127.0.0.1/register
180 178
181 ; help: optional: page providing further assistance for users of your grid 179 ; help: optional: page providing further assistance for users of your grid
182 ; currently unused
183 ;help = http://127.0.0.1/help 180 ;help = http://127.0.0.1/help
184 181
185 ; 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
186 ; currently unused
187 ;password = http://127.0.0.1/password 183 ;password = http://127.0.0.1/password