diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /bin/config-include/GridCommon.ini.example | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/config-include/GridCommon.ini.example')
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 88 |
1 files changed, 51 insertions, 37 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index d12ea5b..5460c0a 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -26,25 +26,31 @@ | |||
26 | ;StorageProvider = "OpenSim.Data.MSSQL.dll" | 26 | ;StorageProvider = "OpenSim.Data.MSSQL.dll" |
27 | ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" | 27 | ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" |
28 | 28 | ||
29 | ; PGSQL | ||
30 | ; Uncomment these lines if you want to use PGSQL storage | ||
31 | ; Change the connection string to your db details | ||
32 | ;StorageProvider = "OpenSim.Data.PGSQL.dll" | ||
33 | ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;" | ||
34 | |||
29 | [Hypergrid] | 35 | [Hypergrid] |
30 | ; Uncomment the variables in this section only if you are in | 36 | ; Uncomment the variables in this section only if you are in |
31 | ; Hypergrid configuration. Otherwise, ignore. | 37 | ; Hypergrid configuration. Otherwise, ignore. |
32 | 38 | ||
33 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} | 39 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} |
34 | ;; If this is a standalone world, this is the address of this instance. | 40 | ;; If this is a standalone world, this is the address of this instance. |
35 | ;; If this is a grided simulator, this is the address of the external robust server that | 41 | ;; If this is a grided simulator, this is the address of the external robust server that |
36 | ;; runs the UserAgentsService. | 42 | ;; runs the UserAgentsService. |
37 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | 43 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 |
38 | ;; This is a default that can be overwritten in some sections. | 44 | ;; This is a default that can be overwritten in some sections. |
39 | ; HomeURI = "http://127.0.0.1:9000" | 45 | ; HomeURI = "http://127.0.0.1:9000" |
40 | 46 | ||
41 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} | 47 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} |
42 | ;; If this is a standalone world, this is the address of this instance. | 48 | ;; If this is a standalone world, this is the address of this instance. |
43 | ;; If this is a grided simulator, this is the address of the external robust server | 49 | ;; If this is a grided simulator, this is the address of the external robust server |
44 | ;; that runs the Gatekeeper service. | 50 | ;; that runs the Gatekeeper service. |
45 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | 51 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 |
46 | ;; This is a default that can be overwritten in some sections. | 52 | ;; This is a default that can be overwritten in some sections. |
47 | ; GatekeeperURI = "http://127.0.0.1:9000" | 53 | ; GatekeeperURI = "http://127.0.0.1:9000" |
48 | 54 | ||
49 | [Modules] | 55 | [Modules] |
50 | ;; Choose one cache module and the corresponding config file, if it exists. | 56 | ;; Choose one cache module and the corresponding config file, if it exists. |
@@ -81,10 +87,10 @@ | |||
81 | InventoryServerURI = "http://mygridserver.com:8003" | 87 | InventoryServerURI = "http://mygridserver.com:8003" |
82 | 88 | ||
83 | [GridInfo] | 89 | [GridInfo] |
84 | ; | 90 | ; |
85 | ; Change this to your grid info service | 91 | ; Change this to your grid info service |
86 | ; | 92 | ; |
87 | GridInfoURI = "http://mygridserver.com:8002" | 93 | GridInfoURI = "http://mygridserver.com:8002" |
88 | 94 | ||
89 | [GridService] | 95 | [GridService] |
90 | ; | 96 | ; |
@@ -157,9 +163,9 @@ | |||
157 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 163 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
158 | ; OutboundPermission = False | 164 | ; OutboundPermission = False |
159 | 165 | ||
160 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling | 166 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling |
161 | ;; and available when they return. True by default. | 167 | ;; and available when they return. True by default. |
162 | ;RestrictInventoryAccessAbroad = True | 168 | ;RestrictInventoryAccessAbroad = True |
163 | 169 | ||
164 | 170 | ||
165 | [HGAssetService] | 171 | [HGAssetService] |
@@ -171,14 +177,14 @@ | |||
171 | HomeURI = "http://mygridserver.com:8002" | 177 | HomeURI = "http://mygridserver.com:8002" |
172 | 178 | ||
173 | ;; The asset types that this grid can export to / import from other grids. | 179 | ;; The asset types that this grid can export to / import from other grids. |
174 | ;; Comma separated. | 180 | ;; Comma separated. |
175 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | 181 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: |
176 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, | 182 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, |
177 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | 183 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh |
178 | ;; | 184 | ;; |
179 | ;; Leave blank or commented if you don't want to apply any restrictions. | 185 | ;; Leave blank or commented if you don't want to apply any restrictions. |
180 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | 186 | ;; A more strict, but still reasonable, policy may be to disallow the exchange |
181 | ;; of scripts, like so: | 187 | ;; of scripts, like so: |
182 | ; DisallowExport ="LSLText" | 188 | ; DisallowExport ="LSLText" |
183 | ; DisallowImport ="LSLBytecode" | 189 | ; DisallowImport ="LSLBytecode" |
184 | 190 | ||
@@ -197,11 +203,19 @@ | |||
197 | MapImageServerURI = "http://mygridserver.com:8003" | 203 | MapImageServerURI = "http://mygridserver.com:8003" |
198 | 204 | ||
199 | [AuthorizationService] | 205 | [AuthorizationService] |
200 | ; If you have regions with access restrictions | 206 | ; If you have regions with access restrictions |
201 | ; specify them here using the convention | 207 | ; specify them here using the convention |
202 | ; Region_<Region_Name> = <flags> | 208 | ; Region_<Region_Name> = <flags> |
203 | ; Valid flags are: | 209 | ; Valid flags are: |
204 | ; DisallowForeigners -- HG visitors not allowed | 210 | ; DisallowForeigners -- HG visitors not allowed |
205 | ; DisallowResidents -- only Admins and Managers allowed | 211 | ; DisallowResidents -- only Admins and Managers allowed |
206 | ; Example: | 212 | ; Example: |
207 | ; Region_Test_1 = "DisallowForeigners" | 213 | ; Region_Test_1 = "DisallowForeigners" |
214 | |||
215 | ;; Uncomment if you are using SimianGrid for grid services | ||
216 | [SimianGrid] | ||
217 | ;; SimianGrid services URL | ||
218 | ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/" | ||
219 | |||
220 | ;; Capability assigned by the grid administrator for the simulator | ||
221 | ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000" | ||