aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/BclExtras.dllbin178688 -> 0 bytes
-rw-r--r--bin/BclExtras35.dllbin0 -> 153600 bytes
-rw-r--r--bin/OpenMetaverse.StructuredData.dllbin102400 -> 102400 bytes
-rw-r--r--bin/OpenMetaverse.dllbin1650688 -> 1675264 bytes
-rw-r--r--bin/OpenMetaverseTypes.dllbin102400 -> 106496 bytes
-rw-r--r--bin/OpenSim.Server.HG.ini.example209
-rw-r--r--bin/OpenSim.Server.ini.example165
-rw-r--r--bin/OpenSim.ini.example147
-rw-r--r--bin/RegionConfig.ini.example11
-rw-r--r--bin/assets/TexturesAssetSet/TexturesAssetSet.xml6
-rw-r--r--bin/assets/TexturesAssetSet/hg2.jp2bin0 -> 24574 bytes
-rw-r--r--bin/config-include/Grid.ini29
-rw-r--r--bin/config-include/GridCommon.ini.example32
-rw-r--r--bin/config-include/GridHypergrid.ini28
-rw-r--r--bin/config-include/Standalone.ini64
-rw-r--r--bin/config-include/StandaloneCommon.ini.example18
-rw-r--r--bin/config-include/StandaloneHypergrid.ini102
17 files changed, 592 insertions, 219 deletions
diff --git a/bin/BclExtras.dll b/bin/BclExtras.dll
deleted file mode 100644
index 505cf01..0000000
--- a/bin/BclExtras.dll
+++ /dev/null
Binary files differ
diff --git a/bin/BclExtras35.dll b/bin/BclExtras35.dll
new file mode 100644
index 0000000..7a7480a
--- /dev/null
+++ b/bin/BclExtras35.dll
Binary files differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index f3244f6..0e571d8 100644
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index edbf3ce..a35b5ae 100644
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 95d6021..c5efaf4 100644
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ
diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example
new file mode 100644
index 0000000..5e3f9a7
--- /dev/null
+++ b/bin/OpenSim.Server.HG.ini.example
@@ -0,0 +1,209 @@
1;; Configurations for enabling HG1.5
2;;
3;; Run
4;; $ OpenSim.Server.exe -inifile OpenSim.Server.HG.ini
5
6;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
7;; OpenSim.Server.Handlers.dll:UserAgentService
8;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector
9;; An additional OpenSim.Server.Handlers.dll:AssetServiceConnector is started
10;; in port 8002, outside the firewall
11;;
12
13[Startup]
14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/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:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
15
16; * This is common for all services, it's the network setup for the entire
17; * server instance, if none if specified above
18; *
19[Network]
20 port = 8003
21
22; * The following are for the remote console
23; * They have no effect for the local or basic console types
24; * Leave commented to diable logins to the console
25;ConsoleUser = Test
26;ConsolePass = secret
27;ConsolePort = 0
28
29[DatabaseService]
30 StorageProvider = "OpenSim.Data.MySQL.dll"
31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
32
33; * As an example, the below configuration precisely mimicks the legacy
34; * asset server. It is read by the asset IN connector (defined above)
35; * and it then loads the OUT connector (a local database module). That,
36; * in turn, reads the asset loader and database connection information
37; *
38[AssetService]
39 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
40 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
41 AssetLoaderArgs = "assets/AssetSets.xml"
42
43; * This configuration loads the inventory server modules. It duplicates
44; * the function of the legacy inventory server
45; *
46[InventoryService]
47 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
48 SessionAuthentication = "false"
49
50; * This is the new style grid service.
51; * "Realm" is the table that is used for user lookup.
52; * It defaults to "regions", which uses the legacy tables
53; *
54[GridService]
55 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
56 Realm = "regions"
57 ; AllowDuplicateNames = "True"
58 ;; Next, we can specify properties of regions, including default and fallback regions
59 ;; The syntax is: Region_<RegionName> = "<flags>"
60 ;; or: Region_<RegionID> = "<flags>"
61 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
62 ;; For example:
63 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
64 ; (replace spaces with underscore)
65
66; * This is the configuration for the freeswitch server in grid mode
67[FreeswitchService]
68 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
69
70; * This is the new style authentication service. Currently, only MySQL
71; * is implemented. "Realm" is the table that is used for user lookup.
72; * By setting it to "users", you can use the old style users table
73; * as an authentication source.
74; *
75[AuthenticationService]
76 ; for the server connector
77 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
78
79[OpenIdService]
80 ; for the server connector
81 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
82 UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
83
84; * This is the new style user service.
85; * "Realm" is the table that is used for user lookup.
86; * It defaults to "users", which uses the legacy tables
87; *
88[UserAccountService]
89 ; for the server connector
90 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
91 ;; These are for creating new accounts by the service
92 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
93 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
94 GridService = "OpenSim.Services.GridService.dll:GridService"
95 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
96
97[PresenceService]
98 ; for the server connector
99 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
100
101[AvatarService]
102 ; for the server connector
103 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
104
105[FriendsService]
106 ; for the server connector
107 LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
108
109[LibraryService]
110 LibraryName = "OpenSim Library"
111 DefaultLibrary = "./inventory/Libraries.xml"
112
113[LoginService]
114 ; for the server connector
115 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
116 ; for the service
117 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
118 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
119 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
120 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
121 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
122 GridService = "OpenSim.Services.GridService.dll:GridService"
123 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
124 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
125 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
126 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
127
128 WelcomeMessage = "Welcome, Avatar!"
129 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
130 ; CHANGE THIS
131 HomeURI = "http://127.0.0.1:8002"
132 GatekeeperURI = "http://127.0.0.1:8002"
133 InventoryServerURI = "http://127.0.0.1:8002"
134 AssetServerURI = "http://127.0.0.1:8002"
135
136[GridInfoService]
137 ; These settings are used to return information on a get_grid_info call.
138 ; Client launcher scripts and third-party clients make use of this to
139 ; autoconfigure the client and to provide a nice user experience. If you
140 ; want to facilitate that, you should configure the settings here according
141 ; to your grid or standalone setup.
142 ;
143 ; See http://opensimulator.org/wiki/GridInfo
144
145 ; login uri: for grid this is the login server URI
146 login = http://127.0.0.1:9000/
147
148 ; long grid name: the long name of your grid
149 gridname = "the lost continent of hippo"
150
151 ; short grid name: the short name of your grid
152 gridnick = "hippogrid"
153
154 ; login page: optional: if it exists it will be used to tell the client to use
155 ; this as splash page
156 ; currently unused
157 ;welcome = http://127.0.0.1/welcome
158
159 ; helper uri: optional: if it exists if will be used to tell the client to use
160 ; this for all economy related things
161 ; currently unused
162 ;economy = http://127.0.0.1:9000/
163
164 ; web page of grid: optional: page providing further information about your grid
165 ; currently unused
166 ;about = http://127.0.0.1/about/
167
168 ; account creation: optional: page providing further information about obtaining
169 ; a user account on your grid
170 ; currently unused
171 ;register = http://127.0.0.1/register
172
173 ; help: optional: page providing further assistance for users of your grid
174 ; currently unused
175 ;help = http://127.0.0.1/help
176
177 ; password help: optional: page providing password assistance for users of your grid
178 ; currently unused
179 ;password = http://127.0.0.1/password
180
181
182[GatekeeperService]
183 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
184 ;; for the service
185 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
186 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
187 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
188 GridService = "OpenSim.Services.GridService.dll:GridService"
189 AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
190 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
191 ; how does the outside world reach me? This acts as public key too.
192 ; CHANGE THIS
193 ExternalName = "http://127.0.0.1:8002"
194
195[UserAgentService]
196 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
197 ;; for the service
198 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
199 GridService = "OpenSim.Services.GridService.dll:GridService"
200
201;; The interface that local users get when they are in other grids.
202;; This restricts the inventory operations while in other grids.
203;; Still not completely safe, especially if users perform inventory operations
204;; while in those grids. The more the user accesses his/her inventory, the more
205;; those simulators will know about the user's inventory.
206[HGInventoryService]
207 ; For the InventoryServiceInConnector
208 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
209
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 372923b..9bedac6 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -1,21 +1,23 @@
1; * The startup section lists all the connectors to start up in this server 1; * 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. 2; * instance. This may be only one, or it may be the entire server suite.
3; * Multiple connectors should be seaprated by commas. 3; * Multiple connectors should be seaprated 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.
4; * 7; *
5; * These are the IN connectors the server uses, the in connectors 8; * These are the IN connectors the server uses, the in connectors
6; * read this config file and load the needed OUT and database connectors 9; * read this config file and load the needed service and database connectors
7; * 10; *
8; * Add "OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" to
9; * enable the experimental authentication service
10; * 11; *
11[Startup] 12[Startup]
12ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector" 13
14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,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:FriendsServiceConnector"
13 15
14; * This is common for all services, it's the network setup for the entire 16; * This is common for all services, it's the network setup for the entire
15; * server instance 17; * server instance, if none if specified above
16; * 18; *
17[Network] 19[Network]
18port = 8003 20 port = 8003
19 21
20; * The following are for the remote console 22; * The following are for the remote console
21; * They have no effect for the local or basic console types 23; * They have no effect for the local or basic console types
@@ -24,31 +26,47 @@ port = 8003
24;ConsolePass = secret 26;ConsolePass = secret
25;ConsolePort = 0 27;ConsolePort = 0
26 28
29[DatabaseService]
30 StorageProvider = "OpenSim.Data.MySQL.dll"
31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
32
33
27; * As an example, the below configuration precisely mimicks the legacy 34; * As an example, the below configuration precisely mimicks the legacy
28; * asset server. It is read by the asset IN connector (defined above) 35; * asset server. It is read by the asset IN connector (defined above)
29; * and it then loads the OUT connector (a local database module). That, 36; * and it then loads the OUT connector (a local database module). That,
30; * in turn, reads the asset loader and database connection information 37; * in turn, reads the asset loader and database connection information
31; * 38; *
32[AssetService] 39[AssetService]
33LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 40 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
34DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 41 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
35AssetLoaderArgs = "assets/AssetSets.xml" 42 AssetLoaderArgs = "assets/AssetSets.xml"
36StorageProvider = "OpenSim.Data.MySQL.dll"
37ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
38 43
39; * This configuration loads the inventory server modules. It duplicates 44; * This configuration loads the inventory server modules. It duplicates
40; * the function of the legacy inventory server 45; * the function of the legacy inventory server
41; * 46; *
42[InventoryService] 47[InventoryService]
43LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 48 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
44UserServerURI = "http://127.0.0.1:8002" 49 SessionAuthentication = "false"
45SessionAuthentication = "false" 50
46StorageProvider = "OpenSim.Data.MySQL.dll" 51; * This is the new style grid service.
47ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 52; * "Realm" is the table that is used for user lookup.
53; * It defaults to "regions", which uses the legacy tables
54; *
55[GridService]
56 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
57 Realm = "regions"
58 ; AllowDuplicateNames = "True"
59 ;; Next, we can specify properties of regions, including default and fallback regions
60 ;; The syntax is: Region_<RegionName> = "<flags>"
61 ;; or: Region_<RegionID> = "<flags>"
62 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
63 ;; For example:
64 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
65 ; (replace spaces with underscore)
48 66
49; * This is the configuration for the freeswitch server in grid mode 67; * This is the configuration for the freeswitch server in grid mode
50[FreeswitchService] 68[FreeswitchService]
51LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 69 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
52 70
53; * This is the new style authentication service. Currently, only MySQL 71; * This is the new style authentication service. Currently, only MySQL
54; * is implemented. "Realm" is the table that is used for user lookup. 72; * is implemented. "Realm" is the table that is used for user lookup.
@@ -56,31 +74,102 @@ LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
56; * as an authentication source. 74; * as an authentication source.
57; * 75; *
58[AuthenticationService] 76[AuthenticationService]
59AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 77 ; for the server connector
60StorageProvider = "OpenSim.Data.MySQL.dll" 78 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
61ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
62; Realm = "users"
63 79
80[OpenIdService]
81 ; for the server connector
82 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
83 UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
84
64; * This is the new style user service. 85; * This is the new style user service.
65; * "Realm" is the table that is used for user lookup. 86; * "Realm" is the table that is used for user lookup.
66; * It defaults to "users", which uses the legacy tables 87; * It defaults to "users", which uses the legacy tables
67; * 88; *
68[UserAccountService] 89[UserAccountService]
69AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService" 90 ; for the server connector
70StorageProvider = "OpenSim.Data.MySQL.dll" 91 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
71ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 92 ; Realm = "useraccounts"
72; Realm = "users" 93 ;; These are for creating new accounts by the service
94 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
95 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
96 GridService = "OpenSim.Services.GridService.dll:GridService"
97 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
73 98
74; * This is the new style grid service. 99[PresenceService]
75; * "Realm" is the table that is used for user lookup. 100 ; for the server connector
76; * It defaults to "regions", which uses the legacy tables 101 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
77; * 102
78[GridService] 103[AvatarService]
79LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 104 ; for the server connector
80StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 105 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
81ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;" 106
82Realm = "regions" 107[FriendsService]
83 108 ; for the server connector
84; If true, duplicate region names are allowed on the grid. If false, no duplicate names are allowed 109 LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
85; Default is false 110
86; AllowDuplicateNames = "True" 111[LibraryService]
112 LibraryName = "OpenSim Library"
113 DefaultLibrary = "./inventory/Libraries.xml"
114
115[LoginService]
116 ; for the server connector
117 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
118 ; for the service
119 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
120 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
121 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
122 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
123 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
124 GridService = "OpenSim.Services.GridService.dll:GridService"
125 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
126 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
127 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
128
129 WelcomeMessage = "Welcome, Avatar!"
130
131
132[GridInfoService]
133 ; These settings are used to return information on a get_grid_info call.
134 ; Client launcher scripts and third-party clients make use of this to
135 ; autoconfigure the client and to provide a nice user experience. If you
136 ; want to facilitate that, you should configure the settings here according
137 ; to your grid or standalone setup.
138 ;
139 ; See http://opensimulator.org/wiki/GridInfo
140
141 ; login uri: for grid this is the login server URI
142 login = http://127.0.0.1:9000/
143
144 ; long grid name: the long name of your grid
145 gridname = "the lost continent of hippo"
146
147 ; short grid name: the short name of your grid
148 gridnick = "hippogrid"
149
150 ; login page: optional: if it exists it will be used to tell the client to use
151 ; this as splash page
152 ; currently unused
153 ;welcome = http://127.0.0.1/welcome
154
155 ; helper uri: optional: if it exists if will be used to tell the client to use
156 ; this for all economy related things
157 ; currently unused
158 ;economy = http://127.0.0.1:9000/
159
160 ; web page of grid: optional: page providing further information about your grid
161 ; currently unused
162 ;about = http://127.0.0.1/about/
163
164 ; account creation: optional: page providing further information about obtaining
165 ; a user account on your grid
166 ; currently unused
167 ;register = http://127.0.0.1/register
168
169 ; help: optional: page providing further assistance for users of your grid
170 ; currently unused
171 ;help = http://127.0.0.1/help
172
173 ; password help: optional: page providing password assistance for users of your grid
174 ; currently unused
175 ;password = http://127.0.0.1/password
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c4b421d..1a6059f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -19,13 +19,6 @@
19 ; inside your firewall, separate patterns with a ';' 19 ; inside your firewall, separate patterns with a ';'
20 ; HttpProxyExceptions = ".mydomain.com;localhost" 20 ; HttpProxyExceptions = ".mydomain.com;localhost"
21 21
22 ; Set this to true if you are connecting your regions to a grid
23 ; Set this to false if you are running in standalone mode
24 gridmode = false
25
26 ; Set this to true if you want Hypergrid functionality
27 hypergrid = false
28
29 startup_console_commands_file = "startup_commands.txt" 22 startup_console_commands_file = "startup_commands.txt"
30 shutdown_console_commands_file = "shutdown_commands.txt" 23 shutdown_console_commands_file = "shutdown_commands.txt"
31 24
@@ -118,7 +111,7 @@
118 ;InworldRestartShutsDown = false 111 ;InworldRestartShutsDown = false
119 112
120 ; ## 113 ; ##
121 ; ## STORAGE 114 ; ## PRIM STORAGE
122 ; ## 115 ; ##
123 116
124 ; *** Prim Storage - only leave one storage_plugin uncommented *** 117 ; *** Prim Storage - only leave one storage_plugin uncommented ***
@@ -134,7 +127,7 @@
134 ; --- To use MySQL storage, supply your own connection string (this is only an example): 127 ; --- To use MySQL storage, supply your own connection string (this is only an example):
135 ; note that the supplied account needs create privilegies if you want it to auto-create needed tables. 128 ; note that the supplied account needs create privilegies if you want it to auto-create needed tables.
136 ; 129 ;
137 ; -->>> There are multiple connection strings defined in several places in this file. Check it carefully! 130 ; -->>> There are multiple connection strings defined in several places. Check it carefully!
138 ; 131 ;
139 ; storage_plugin="OpenSim.Data.MySQL.dll" 132 ; storage_plugin="OpenSim.Data.MySQL.dll"
140 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 133 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
@@ -142,15 +135,6 @@
142 ; uncomment and change this connect string. Defaults to the above if not set 135 ; uncomment and change this connect string. Defaults to the above if not set
143 ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 136 ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
144 137
145 ; Select whether you want to use local or grid asset storage.
146 ;
147 ; If you're running in standalone, you definitely want local, since there is no grid (hence this is redundant, and should
148 ; really be eliminated). The database itself is defined in asset_plugin below
149 ;
150 ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the
151 ; grid asset server. If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets
152 ; locally. This will mean you won't be able to take items using your assets to other people's regions.
153
154 ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to 138 ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
155 ; prevent frequently changing objects from heavily loading the region data store. 139 ; prevent frequently changing objects from heavily loading the region data store.
156 ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep. 140 ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
@@ -273,6 +257,10 @@
273 ; to be enabled from the console if this is set 257 ; to be enabled from the console if this is set
274 ; StartDisabled = false 258 ; StartDisabled = false
275 259
260 ; Image decoding. Use CSJ2K for layer boundary decoding if true,
261 ; OpenJPEG if false
262 ; UseCSJ2K = true
263
276[SMTP] 264[SMTP]
277 enabled=false 265 enabled=false
278 266
@@ -284,63 +272,11 @@
284 ;SMTP_SERVER_LOGIN=foo 272 ;SMTP_SERVER_LOGIN=foo
285 ;SMTP_SERVER_PASSWORD=bar 273 ;SMTP_SERVER_PASSWORD=bar
286 274
287
288[Communications]
289 ;InterregionComms = "LocalComms"
290 InterregionComms = "RESTComms"
291
292
293[StandAlone]
294 ; If this is set to true then OpenSim only allows in users who already have accounts.
295 ; An account can be created using the "create user" console command.
296 ;
297 ; If this is set to false then an account is automatically created for a user who logs in
298 ; without one. PLEASE NOTE THAT IN THIS MODE NO PASSWORD CHECKS ARE PERFORMED.
299 ; Therefore, any user can log into any account. If accounts_authenticate is later switched to
300 ; true then the passwords will need to be reset (using the "reset user password" console command) since
301 ; automatically created accounts have their password set to the string "test".
302 ;
303 ; This setting applies to standalone mode only, not grid or other modes. Default is true.
304 accounts_authenticate = true
305
306 welcome_message = "Welcome to OpenSimulator"
307
308 ; Inventory database provider
309 inventory_plugin = "OpenSim.Data.SQLite.dll"
310 ; inventory_plugin = "OpenSim.Data.MySQL.dll"
311
312 ; Inventory source SQLite example
313 inventory_source = "URI=file:inventoryStore.db,version=3"
314 ; Inventory Source MySQL example
315 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
316
317 ; User Data Database provider
318 ;
319 ; Multiple providers can be specified by separating them with commas (whitespace is unimportant)
320 ; If multiple providers are specified then if a profile is requested, each is queried until one
321 ; provides a valid profile, or until all providers have been queried.
322 ; Unfortunately the order of querying is currently undefined (it may not be the order in which
323 ; providers are specified here). This needs to be fixed
324 ;
325 userDatabase_plugin = "OpenSim.Data.SQLite.dll"
326 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
327
328 ; User source SQLite example
329 user_source = "URI=file:userprofiles.db,version=3"
330 ; User Source MySQL example
331 ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
332
333 ; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute
334 ; Default is ./inventory/Libraries.xml
335 LibrariesXMLFile="./inventory/Libraries.xml"
336
337[Network] 275[Network]
338 ConsoleUser = "Test" 276 ConsoleUser = "Test"
339 ConsolePass = "secret" 277 ConsolePass = "secret"
340 http_listener_port = 9000 278 http_listener_port = 9000
341 console_port = 0 279 console_port = 0
342 default_location_x = 1000
343 default_location_y = 1000
344 280
345 ; ssl config: Experimental! The auto https config only really works definately on windows XP now 281 ; ssl config: Experimental! The auto https config only really works definately on windows XP now
346 ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below 282 ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
@@ -357,21 +293,6 @@
357 ; Uncomment below to enable llRemoteData/remote channels 293 ; Uncomment below to enable llRemoteData/remote channels
358 ; remoteDataPort = 20800 294 ; remoteDataPort = 20800
359 295
360 grid_server_url = "http://127.0.0.1:8003"
361 grid_send_key = "null"
362 grid_recv_key = "null"
363
364 user_server_url = "http://127.0.0.1:8002"
365 user_send_key = "null"
366 user_recv_key = "null"
367
368 asset_server_url = "http://127.0.0.1:8003"
369
370 inventory_server_url = "http://127.0.0.1:8003"
371
372 ; The MessagingServer is a companion of the UserServer. It uses
373 ; user_send_key and user_recv_key, too
374 messaging_server_url = "http://127.0.0.1:8006"
375 296
376 ; What is reported as the "X-Secondlife-Shard" 297 ; What is reported as the "X-Secondlife-Shard"
377 ; Defaults to the user server url if not set 298 ; Defaults to the user server url if not set
@@ -1074,52 +995,6 @@
1074 ; DisableUndergroundMovement = true 995 ; DisableUndergroundMovement = true
1075 996
1076 997
1077[GridInfo]
1078 ; These settings are used to return information on a get_grid_info call.
1079 ; Client launcher scripts and third-party clients make use of this to
1080 ; autoconfigure the client and to provide a nice user experience. If you
1081 ; want to facilitate that, you should configure the settings here according
1082 ; to your grid or standalone setup.
1083 ;
1084 ; See http://opensimulator.org/wiki/GridInfo
1085
1086 ; login uri: for grid this is the user server URI
1087 login = http://127.0.0.1:9000/
1088
1089 ; long grid name: the long name of your grid
1090 gridname = "the lost continent of hippo"
1091
1092 ; short grid name: the short name of your grid
1093 gridnick = "hippogrid"
1094
1095 ; login page: optional: if it exists it will be used to tell the client to use
1096 ; this as splash page
1097 ; currently unused
1098 ;welcome = http://127.0.0.1/welcome
1099
1100 ; helper uri: optional: if it exists if will be used to tell the client to use
1101 ; this for all economy related things
1102 ; currently unused
1103 ;economy = http://127.0.0.1:9000/
1104
1105 ; web page of grid: optional: page providing further information about your grid
1106 ; currently unused
1107 ;about = http://127.0.0.1/about/
1108
1109 ; account creation: optional: page providing further information about obtaining
1110 ; a user account on your grid
1111 ; currently unused
1112 ;register = http://127.0.0.1/register
1113
1114 ; help: optional: page providing further assistance for users of your grid
1115 ; currently unused
1116 ;help = http://127.0.0.1/help
1117
1118 ; password help: optional: page providing password assistance for users of your grid
1119 ; currently unused
1120 ;password = http://127.0.0.1/password
1121
1122
1123[OpenGridProtocol] 998[OpenGridProtocol]
1124 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. 999 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
1125 ;On/true or Off/false 1000 ;On/true or Off/false
@@ -1414,3 +1289,13 @@
1414 1289
1415 ;XmlRpcRouterModule = "XmlRpcRouterModule" 1290 ;XmlRpcRouterModule = "XmlRpcRouterModule"
1416 ;XmlRpcPort = 20800 1291 ;XmlRpcPort = 20800
1292
1293[Friends]
1294 ; The port the friendslist interregion comms will listen on
1295 ; Defaults to the simulator's TCP port
1296 ;Port = 0
1297
1298 ; Uncomment one of the lines below. Use FriendsService for local
1299 ; operation, Connectors for remote operation
1300 ;Connector = "OpenSim.Services.FriendsService.dll"
1301 Connector = "OpenSim.Services.Connectors.dll"
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example
index 8d833df..d45fe9d 100644
--- a/bin/RegionConfig.ini.example
+++ b/bin/RegionConfig.ini.example
@@ -20,17 +20,6 @@ AllowAlternatePorts = False
20ExternalHostName = "SYSTEMIP" 20ExternalHostName = "SYSTEMIP"
21 21
22; * 22; *
23; * Master avatar stuff. Set either a UUID (from OSGrid or your server)
24; * OR a first and last name. Password is only needed for sandbox mode
25; * The default assigns no master avatar
26; *
27
28MasterAvatarUUID = "00000000-0000-0000-0000-000000000000"
29; MasterAvatarFirstName = ""
30; MasterAvatarLastName = ""
31; MasterAvatarSandboxPassword = ""
32
33; *
34; * Prim data 23; * Prim data
35; * This allows limiting the sizes of prims and the region prim count 24; * This allows limiting the sizes of prims and the region prim count
36; * 25; *
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index 773de44..1d7f2a4 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -343,6 +343,12 @@
343 <Key Name="assetType" Value="0" /> 343 <Key Name="assetType" Value="0" />
344 <Key Name="fileName" Value="femaleface.jp2"/> 344 <Key Name="fileName" Value="femaleface.jp2"/>
345 </Section> 345 </Section>
346 <Section Name="Hyperlink Map Texture">
347 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000013"/>
348 <Key Name="name" Value="Hyperlink Map Texture"/>
349 <Key Name="assetType" Value="0" />
350 <Key Name="fileName" Value="hg2.jp2"/>
351 </Section>
346 <Section Name="Moon"> 352 <Section Name="Moon">
347 <Key Name="assetID" Value="ec4b9f0b-d008-45c6-96a4-01dd947ac621"/> 353 <Key Name="assetID" Value="ec4b9f0b-d008-45c6-96a4-01dd947ac621"/>
348 <Key Name="name" Value="Moon"/> 354 <Key Name="name" Value="Moon"/>
diff --git a/bin/assets/TexturesAssetSet/hg2.jp2 b/bin/assets/TexturesAssetSet/hg2.jp2
new file mode 100644
index 0000000..9a66fd3
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/hg2.jp2
Binary files differ
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5b19130..9dff325 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,15 +10,30 @@
10[Modules] 10[Modules]
11 AssetServices = "RemoteAssetServicesConnector" 11 AssetServices = "RemoteAssetServicesConnector"
12 InventoryServices = "RemoteInventoryServicesConnector" 12 InventoryServices = "RemoteInventoryServicesConnector"
13 AuthorizationServices = "RemoteAuthorizationServicesConnector"
14 NeighbourServices = "RemoteNeighbourServicesConnector"
15 GridServices = "RemoteGridServicesConnector" 13 GridServices = "RemoteGridServicesConnector"
16 NeighbourServiceInConnector = true 14 AvatarServices = "RemoteAvatarServicesConnector"
15 NeighbourServices = "RemoteNeighbourServicesConnector"
16 AuthenticationServices = "RemoteAuthenticationServicesConnector"
17 PresenceServices = "RemotePresenceServicesConnector"
18 UserAccountServices = "RemoteUserAccountServicesConnector"
19 SimulationServices = "RemoteSimulationConnectorModule"
20 EntityTransferModule = "BasicEntityTransferModule"
21 InventoryAccessModule = "BasicInventoryAccessModule"
17 LandServiceInConnector = true 22 LandServiceInConnector = true
18 LLProxyLoginModule = true 23 NeighbourServiceInConnector = true
24 SimulationServiceInConnector = true
25 LibraryModule = true
26
19 27
20[GridService] 28[GridService]
21 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 29 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
22 ; for the LocalGridServicesConnector which is used by the Remote one 30 ; for the LocalGridServicesConnector which is used by the Remote one
23 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 31 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
24 \ No newline at end of file 32
33[LibraryService]
34 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
35 LibraryName = "OpenSim Library"
36 DefaultLibrary = "./inventory/Libraries.xml"
37
38[Friends]
39 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6da0f1e..4717561 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -20,6 +20,38 @@
20 ; change this to your grid-wide grid server 20 ; change this to your grid-wide grid server
21 ; 21 ;
22 GridServerURI = "http://mygridserver.com:8003" 22 GridServerURI = "http://mygridserver.com:8003"
23 ;AllowHypergridMapSearch = true
24
25[AvatarService]
26 ;
27 ; change this to your grid-wide grid server
28 ;
29 AvatarServerURI = "http://mygridserver.com:8003"
30
31[PresenceService]
32 ;
33 ; change this to your grid-wide presence server
34 ;
35 PresenceServerURI = "http://mygridserver.com:8003"
36
37[UserAccountService]
38 ;
39 ; change this to your grid-wide user accounts server
40 ;
41 UserAccountServerURI = "http://mygridserver.com:8003"
42
43[AuthenticationService]
44 ;
45 ; change this to your grid-wide authentication server
46 ;
47 AuthenticationServerURI = "http://mygridserver.com:8003"
48
49[FriendsService]
50 ;
51 ; change this to your grid-wide friends server
52 ;
53 FriendsServerURI = "http://mygridserver.com:8003"
54
23 55
24[Modules] 56[Modules]
25 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 57 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index a5fe6e9..b567817 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,18 +7,23 @@
7[Includes] 7[Includes]
8 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
9 9
10[Startup]
11 hypergrid = true
12
13[Modules] 10[Modules]
14 AssetServices = "HGAssetBroker" 11 AssetServices = "HGAssetBroker"
15 InventoryServices = "HGInventoryBroker" 12 InventoryServices = "HGInventoryBroker"
13 GridServices = "RemoteGridServicesConnector"
14 AvatarServices = "RemoteAvatarServicesConnector"
16 NeighbourServices = "RemoteNeighbourServicesConnector" 15 NeighbourServices = "RemoteNeighbourServicesConnector"
17 GridServices = "HGGridServicesConnector" 16 AuthenticationServices = "RemoteAuthenticationServicesConnector"
18 NeighbourServiceInConnector = true 17 AuthorizationServices = "LocalAuthorizationServicesConnector"
18 PresenceServices = "RemotePresenceServicesConnector"
19 UserAccountServices = "RemoteUserAccountServicesConnector"
20 SimulationServices = "RemoteSimulationConnectorModule"
21 EntityTransferModule = "HGEntityTransferModule"
22 InventoryAccessModule = "HGInventoryAccessModule"
19 LandServiceInConnector = true 23 LandServiceInConnector = true
20 HypergridServiceInConnector = true 24 NeighbourServiceInConnector = true
21 LLProxyLoginModule = true 25 SimulationServiceInConnector = true
26 LibraryModule = true
22 27
23[AssetService] 28[AssetService]
24 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 29 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -29,9 +34,12 @@
29 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" 34 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
30 35
31[GridService] 36[GridService]
32 ; for the HGGridServicesConnector to instantiate
33 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
34 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, 37 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
35 ; which in turn uses this 38 ; which in turn uses this
36 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 39 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
37 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 40 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
41
42 AllowHypergridMapSearch = true
43
44[Friends]
45 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 35ee01e..3011370 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -4,16 +4,20 @@
4;; which you can copy and change. 4;; which you can copy and change.
5;; 5;;
6 6
7[Includes]
8 Include-Common = "config-include/StandaloneCommon.ini"
9
10[Modules] 7[Modules]
11 AssetServices = "LocalAssetServicesConnector" 8 AssetServices = "LocalAssetServicesConnector"
12 InventoryServices = "LocalInventoryServicesConnector" 9 InventoryServices = "LocalInventoryServicesConnector"
13 NeighbourServices = "LocalNeighbourServicesConnector" 10 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 11 AuthenticationServices = "LocalAuthenticationServicesConnector"
15 GridServices = "LocalGridServicesConnector" 12 GridServices = "LocalGridServicesConnector"
13 PresenceServices = "LocalPresenceServicesConnector"
14 UserAccountServices = "LocalUserAccountServicesConnector"
15 SimulationServices = "LocalSimulationConnectorModule"
16 AvatarServices = "LocalAvatarServicesConnector"
17 EntityTransferModule = "BasicEntityTransferModule"
18 InventoryAccessModule = "BasicInventoryAccessModule"
16 LibraryModule = true 19 LibraryModule = true
20 LLLoginServiceInConnector = true
17 21
18[AssetService] 22[AssetService]
19 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 23 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,9 +25,61 @@
21[InventoryService] 25[InventoryService]
22 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 26 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
23 27
28[LibraryService]
29 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
30 LibraryName = "OpenSim Library"
31 DefaultLibrary = "./inventory/Libraries.xml"
32
33[AvatarService]
34 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
35 ConnectionString = "URI=file:avatars.db,version=3"
36
24[AuthorizationService] 37[AuthorizationService]
25 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 38 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
26 39
40[AuthenticationService]
41 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
42 ConnectionString = "URI=file:auth.db,version=3"
43
27[GridService] 44[GridService]
28 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
29 Realm = "regions" 46 Realm = "regions"
47 StorageProvider = "OpenSim.Data.Null.dll"
48
49[PresenceService]
50 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
51 StorageProvider = "OpenSim.Data.Null.dll"
52
53[UserAccountService]
54 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
55 ConnectionString = "URI=file:userprofiles.db,version=3"
56
57 ;; These are for creating new accounts
58 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
59 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
60 GridService = "OpenSim.Services.GridService.dll:GridService"
61 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
62
63[FriendsService]
64 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
65 ConnectionString = "URI=file:friends.db,version=3"
66
67[Friends]
68 Connector = "OpenSim.Services.FriendsService.dll"
69
70[LoginService]
71 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
72 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
73 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
74 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
75 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
76 GridService = "OpenSim.Services.GridService.dll:GridService"
77 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
78 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
79
80 WelcomeMessage = "Welcome, Avatar!"
81
82
83;; This should always be the very last thing on this file
84[Includes]
85 Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1679f93..8e21a8c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,7 +39,23 @@
39 ;;--- For MySql region storage (alternative) 39 ;;--- For MySql region storage (alternative)
40 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 40 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
41 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" 41 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
42 ;; Next, we can specify properties of regions, including default and fallback regions
43 ;; The syntax is: Region_<RegioName> = "<flags>"
44 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
45 ;; For example:
46 Region_Welcome_Area = "DefaultRegion, FallbackRegion"
42 47
43[LibraryModule] 48[LibraryModule]
44 ; Set this if you want to change the name of the OpenSim Library 49 ; Set this if you want to change the name of the OpenSim Library
45 ;LibraryName = "My World's Library" \ No newline at end of file 50 ;LibraryName = "My World's Library"
51
52[LoginService]
53 WelcomeMessage = "Welcome, Avatar!"
54
55 HomeURI = "http://127.0.0.1:9000"
56 GatekeeperURI = "http://127.0.0.1:9000"
57 InventoryServerURI = "http://127.0.0.1:9000"
58 AssetServerURI = "http://127.0.0.1:9000"
59
60[GatekeeperService]
61 ExternalName = "http://127.0.0.1:9000"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..1d8e2ef 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,28 +3,29 @@
3;; All optional settings are in StandaloneCommon.ini.example, 3;; All optional settings are in StandaloneCommon.ini.example,
4;; which you can copy and change. 4;; which you can copy and change.
5;; 5;;
6
7[Includes]
8 Include-Common = "config-include/StandaloneCommon.ini"
9
10[Startup]
11 hypergrid = true
12 6
13[Modules] 7[Modules]
14 AssetServices = "HGAssetBroker" 8 AssetServices = "HGAssetBroker"
15 InventoryServices = "HGInventoryBroker" 9 InventoryServices = "HGInventoryBroker"
16 NeighbourServices = "RemoteNeighbourServicesConnector" 10 NeighbourServices = "LocalNeighbourServicesConnector"
17 AuthorizationServices = "LocalAuthorizationServicesConnector" 11 AuthenticationServices = "LocalAuthenticationServicesConnector"
18 GridServices = "HGGridServicesConnector" 12 GridServices = "LocalGridServicesConnector"
13 PresenceServices = "LocalPresenceServicesConnector"
14 UserAccountServices = "LocalUserAccountServicesConnector"
15 SimulationServices = "RemoteSimulationConnectorModule"
16 AvatarServices = "LocalAvatarServicesConnector"
17 EntityTransferModule = "HGEntityTransferModule"
18 InventoryAccessModule = "HGInventoryAccessModule"
19 InventoryServiceInConnector = true 19 InventoryServiceInConnector = true
20 AssetServiceInConnector = true 20 AssetServiceInConnector = true
21 HGAuthServiceInConnector = true
22 HypergridServiceInConnector = true 21 HypergridServiceInConnector = true
23 NeighbourServiceInConnector = true 22 NeighbourServiceInConnector = true
24 LibraryModule = true 23 LibraryModule = true
24 LLLoginServiceInConnector = true
25 AuthenticationServiceInConnector = true
26 SimulationServiceInConnector = true
25 27
26[AssetService] 28[AssetService]
27 ; For the AssetServiceInConnector
28 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 29 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
29 30
30 ; For HGAssetBroker 31 ; For HGAssetBroker
@@ -32,23 +33,90 @@
32 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" 33 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
33 34
34[InventoryService] 35[InventoryService]
35 ; For the InventoryServiceInConnector
36 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 36 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
37 37
38 ; For HGInventoryBroker 38 ; For HGInventoryBroker
39 LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 39 LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
40 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" 40 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
41 41
42[AvatarService]
43 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
44 ConnectionString = "URI=file:avatars.db,version=3"
45
46[LibraryService]
47 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
48 LibraryName = "OpenSim Library"
49 DefaultLibrary = "./inventory/Libraries.xml"
50
42[AuthorizationService] 51[AuthorizationService]
43 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 52 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
44 53
45[AuthenticationService] 54[AuthenticationService]
46 ; For the HGAuthServiceInConnector 55 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
47 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" 56 ConnectionString = "URI=file:auth.db,version=3"
48 57
49[GridService] 58[GridService]
50 ; for the HGGridServicesConnector to instantiate
51 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
52 ; LocalGridServicesConnector needs this 59 ; LocalGridServicesConnector needs this
53 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 60 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54 Realm = "regions" 61 Realm = "regions"
62 StorageProvider = "OpenSim.Data.Null.dll"
63
64 AllowHypergridMapSearch = true
65
66[PresenceService]
67 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
68 StorageProvider = "OpenSim.Data.Null.dll"
69
70[UserAccountService]
71 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
72 ConnectionString = "URI=file:userprofiles.db,version=3"
73 ;; These are for creating new accounts by the service
74 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
75 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
76 GridService = "OpenSim.Services.GridService.dll:GridService"
77 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
78
79[FriendsService]
80 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
81 ConnectionString = "URI=file:friends.db,version=3"
82
83[Friends]
84 Connector = "OpenSim.Services.FriendsService.dll"
85
86[LoginService]
87 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
88 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
89 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
90 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
91 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
92 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
93 GridService = "OpenSim.Services.GridService.dll:GridService"
94 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
95 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
96
97[GatekeeperService]
98 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
99 ;; for the service
100 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
101 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
102 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
103 GridService = "OpenSim.Services.GridService.dll:GridService"
104 AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
105 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
106
107[UserAgentService]
108 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
109 ;; for the service
110 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
111 GridService = "OpenSim.Services.GridService.dll:GridService"
112
113;; The interface that local users get when they are in other grids
114;; This greatly restricts the inventory operations while in other grids
115[HGInventoryService]
116 ; For the InventoryServiceInConnector
117 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
118
119
120;; This should always be the very last thing on this file
121[Includes]
122 Include-Common = "config-include/StandaloneCommon.ini"