aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-15 23:03:02 +0100
committerJustin Clark-Casey (justincc)2010-09-15 23:03:02 +0100
commite6bc77d832812ed1e51ee643638c680f520b25d0 (patch)
treefb295d46ba4c11a8e15e077974c03906569c5295
parentrename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co... (diff)
parentMark up OpenSim.ini.example for use with an automatic configuration tool. (diff)
downloadopensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.zip
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.gz
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.bz2
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Services/Connectors/Simulation/EstateDataService.cs13
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationDataService.cs8
-rw-r--r--bin/OpenSim.ini.example686
-rw-r--r--bin/OpenSimDefaults.ini39
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridCommon.ini.example3
-rw-r--r--bin/config-include/GridHypergrid.ini1
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
8 files changed, 712 insertions, 42 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index 87c49d3..8a8b46d 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -60,9 +60,16 @@ namespace OpenSim.Services.Connectors
60 if (dbConfig != null) 60 if (dbConfig != null)
61 { 61 {
62 dllName = dbConfig.GetString("StorageProvider", String.Empty); 62 dllName = dbConfig.GetString("StorageProvider", String.Empty);
63 connString = dbConfig.GetString("EstateConnectionString", String.Empty); 63 connString = dbConfig.GetString("ConnectionString", String.Empty);
64 if (String.IsNullOrEmpty(connString)) 64 connString = dbConfig.GetString("EstateConnectionString", connString);
65 connString = dbConfig.GetString("ConnectionString", String.Empty); 65 }
66
67 // Try reading the [EstateDataStore] section, if it exists
68 IConfig estConfig = config.Configs["EstateDataStore"];
69 if (estConfig != null)
70 {
71 dllName = estConfig.GetString("StorageProvider", dllName);
72 connString = estConfig.GetString("ConnectionString", connString);
66 } 73 }
67 74
68 // We tried, but this doesn't exist. We can't proceed 75 // We tried, but this doesn't exist. We can't proceed
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 946f7e4..c8ecb18 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -63,6 +63,14 @@ namespace OpenSim.Services.Connectors
63 connString = dbConfig.GetString("ConnectionString", String.Empty); 63 connString = dbConfig.GetString("ConnectionString", String.Empty);
64 } 64 }
65 65
66 // Try reading the [SimulationDataStore] section
67 IConfig simConfig = config.Configs["SimulationDataStore"];
68 if (simConfig != null)
69 {
70 dllName = simConfig.GetString("StorageProvider", dllName);
71 connString = simConfig.GetString("ConnectionString", connString);
72 }
73
66 // We tried, but this doesn't exist. We can't proceed 74 // We tried, but this doesn't exist. We can't proceed
67 if (dllName == String.Empty) 75 if (dllName == String.Empty)
68 throw new Exception("No StorageProvider configured"); 76 throw new Exception("No StorageProvider configured");
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 5d09faa..109e0aa 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1 +1,685 @@
1;# Use this file to override the defaults 1;; A note on the format of this file
2;;
3;; All leading white space is ignored, but preserved.
4;;
5;; Double semicolons denote a text comment
6;;
7;; ;# denotes a configuration directive description
8;; formatted as:
9;; {option} {depends on} {question to ask} {choices} default value
10;; Any text comments following the declaration, up to the next blank line.
11;; will be copied to the generated file.
12;; A * in the choices list will allow an empty entry.\
13;; An empty question will set the default if the dependencies are
14;; satisfied.
15;;
16;; ; denotes a commented option. It is ignored.
17
18[Startup]
19 ;# {save_crashes} {} {Save crashes to disk?} {true false} false
20 ;; Set this to true if you want to log crashes to disk
21 ;; this can be useful when submitting bug reports.
22 ; save_crashes = false
23
24 ;# {crash_dir} {save_crashes:true} {Directory to save crashes to?} {} crashes
25 ;; Directory to save crashes to if above is enabled
26 ;; (default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
27 ; crash_dir = "crashes"
28
29 ;# {PIDFile} {} {Path to PID file?} {}
30 ;; Place to create a PID file
31 ; PIDFile = "/tmp/my.pid"
32
33 ;; Determine where OpenSimulator looks for the files which tell it
34 ;; which regions to server
35 ;; Defaults to "filesystem" if this setting isn't present
36 ; region_info_source = "filesystem"
37 ; region_info_source = "web"
38
39 ;; Determines where the region XML files are stored if you are loading
40 ;; these from the filesystem.
41 ;; Defaults to bin/Regions in your OpenSimulator installation directory
42 ; regionload_regionsdir="C:\somewhere\xmlfiles\"
43
44 ;; Determines the page from which regions xml is retrieved if you are
45 ;; loading these from the web.
46 ;; The XML here has the same format as it does on the filesystem
47 ;; (including the <Root> tag), except that everything is also enclosed
48 ;; in a <Regions> tag.
49 ; regionload_webserver_url = "http://example.com/regions.xml";
50
51 ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} false
52 ;; Use terrain texture for maptiles if true, use shaded green if false
53 ; TextureOnMapTile = false
54
55 ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
56 ;; Draw objects on maptile. This step might take a long time if you've
57 ;; got a large number of objects, so you can turn it off here if you'd like.
58 ; DrawPrimOnMapTile = true
59
60 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
61 ;; Maximum size for non-physical prims
62 ; NonPhysicalPrimMax = 256
63
64 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
65 ;; Maximum size where a prim can be physical
66 ; PhysicalPrimMax = 10
67
68 ;; Prevent the creation, import and rez of prims that exceed the
69 ;; maximum size.
70 ; ClampPrimSize = false
71
72 ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false
73 ;; Allow scripts to cross region boundaries. These are recompiled on the
74 ;; new region.
75 ; AllowScriptCrossing = false
76
77 ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false
78 ;; Allow compiled script binary code to cross region boundaries.
79 ;; If you set this to "true", any region that can teleport to you can
80 ;; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
81 ;; YOU HAVE BEEN WARNED!!!
82 ; TrustBinaries = false
83
84 ;# {CombineContiguousRegions} {} {Create megaregions where possible? (Do not use with existing content!)} {true false} false
85 ;; Combine all contiguous regions into one large megaregion
86 ;; Order your regions from South to North, West to East in your regions.ini
87 ;; and then set this to true
88 ;; Warning! Don't use this with regions that have existing content!,
89 ;; This will likely break them
90 ; CombineContiguousRegions = false
91
92 ;; If you have only one region in an instance, or to avoid the many bugs
93 ;; that you can trigger in modules by restarting a region, set this to
94 ;; true to make the entire instance exit instead of restarting the region.
95 ;; This is meant to be used on systems where some external system like
96 ;; Monit will restart any instance that exits, thereby making the shutdown
97 ;; into a restart.
98 ; InworldRestartShutsDown = false
99
100 ;; Persistence of changed objects happens during regular sweeps. The
101 ;; following control that behaviour to prevent frequently changing objects
102 ;; from heavily loading the region data store.
103 ;; If both of these values are set to zero then persistence of all changed
104 ;; objects will happen on every sweep.
105
106 ;; Objects will be considered for persistance in the next sweep when they
107 ;; have not changed for this number of seconds.
108 ; MinimumTimeBeforePersistenceConsidered = 60
109
110 ;; Objects will always be considered for persistance in the next sweep
111 ;; if the first change occurred this number of seconds ago.
112 ; MaximumTimeBeforePersistenceConsidered = 600
113
114 ;; Should avatars in neighbor sims see objects in this sim?
115 ; see_into_this_sim_from_neighbor = true
116
117 ;# {physical_prim} {} {Allow prims to be physical?} {true false} true
118 ;; if you would like to allow prims to be physical and move by physics
119 ;; with the physical checkbox in the client set this to true.
120 ; physical_prim = true
121
122 ;; Select a mesher here.
123 ;;
124 ;; Meshmerizer properly handles complex prims by using triangle meshes.
125 ;; Note that only the ODE physics engine currently deals with meshed
126 ;; prims in a satisfactory way.
127
128 ;; ZeroMesher is faster but leaves the physics engine to model the mesh
129 ;; using the basic shapes that it supports.
130 ;; Usually this is only a box.
131 ; meshing = Meshmerizer
132 ; meshing = ZeroMesher
133
134 ;; Choose one of the physics engines below
135 ;; OpenDynamicsEngine is by some distance the most developed physics engine
136 ;; basicphysics effectively does not model physics at all, making all
137 ;; objects phantom
138 ; physics = OpenDynamicsEngine
139 ; physics = basicphysics
140 ; physics = POS
141 ; physics = modified_BulletX
142
143 ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule
144 ;; Permission modules to use, separated by space.
145 ; permissionmodules = "DefaultPermissionsModule"
146
147 ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
148 ;; These are the parameters for the default permissions module
149 ;;
150 ;; If set to false, then, in theory, the server never carries out
151 ;; permission checks (allowing anybody to copy
152 ;; any item, etc. This may not yet be implemented uniformally.
153 ;; If set to true, then all permissions checks are carried out
154 ;; Default is false
155 ; serverside_object_permissions = false
156
157 ;; This allows users with a UserLevel of 200 or more to assume god
158 ;; powers in the regions in this simulator.
159 ; allow_grid_gods = false
160
161 ;; This allows some control over permissions
162 ;; please note that this still doesn't duplicate SL, and is not intended to
163 ; region_owner_is_god = true
164 ; region_manager_is_god = false
165 ; parcel_owner_is_god = true
166
167 ;; Default script engine to use. Currently, we only have XEngine
168 ; DefaultScriptEngine = "XEngine"
169
170 ;; Map tile options. You can choose to generate no map tiles at all,
171 ;; generate normal maptiles, or nominate an uploaded texture to
172 ;; be the map tile
173 ; GenerateMaptiles = "true"
174
175 ;; If desired, a running region can update the map tiles periodically
176 ;; to reflect building activity. This names no sense of you don't have
177 ;; prims on maptiles. Value is in seconds.
178 ; MaptileRefresh = 0
179
180 ;; If not generating maptiles, use this static texture asset ID
181 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
182
183 ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {true false} false
184 ;; The email module requires some configuration. It needs an SMTP
185 ;; server to send mail through.
186 ; emailmodule = DefaultEmailModule
187
188[SMTP]
189 ;; The SMTP server enabled the email module to send email to external
190 ;; destinations.
191
192 ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} true
193 ;; Enable sending email via SMTP
194 ; enabled = false
195
196 ;# {internal_object_host} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Host name to treat as internal (object to object) email?} {} lsl.opensim.local
197 ; internal_object_host = lsl.opensim.local
198
199 ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1
200 ; host_domain_header_from = "127.0.0.1"
201
202 ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1
203 ; SMTP_SERVER_HOSTNAME = "127.0.0.1"
204
205 ;# {SMTP_SERVER_PORT} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {SMTP server port?} {} 25
206 ; SMTP_SERVER_PORT = 25
207
208 ;# {SMTP_SERVER_LOGIN} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server user name?} {}
209 ; SMTP_SERVER_LOGIN = ""
210
211 ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
212 ; SMTP_SERVER_PASSWORD = ""
213
214[Network]
215 ;; Configure the remote console user here. This will not actually be used
216 ;; unless you use -console=rest at startup.
217 ; ConsoleUser = "Test"
218 ; ConsolePass = "secret"
219 ; console_port = 0
220
221 ;# {http_listener_port} {} {TCP Port for this simulator to listen on? (This must be unique to the simulator!)} {} 9000
222 ;; Simulator HTTP port. This is not the region port, but the port the
223 ;; entire simulator listens on. This port uses the TCP protocol, while
224 ;; the region ports use UDP.
225 ; http_listener_port = 9000
226
227 ;# {ExternalHostNameForLSL} {} {Hostname to use for HTTP-IN URLs. This should be reachable from the internet.} {}
228 ;; Hostname to use in llRequestURL/llRequestSecureURL
229 ;; if not defined - default machine name is being used
230 ;; (on Windows this mean NETBIOS name - useably only inside local network)
231 ; ExternalHostNameForLSL = "127.0.0.1"
232
233 ;# {shard} {} {Name to use for X-Secondlife-Shard header? (press enter if unsure)} {} OpenSim
234 ;; What is reported as the "X-Secondlife-Shard"
235 ;; Defaults to the user server url if not set
236 ;; The old default is "OpenSim", set here for compatibility
237 ;; The below is not commented for compatibility.
238 shard = "OpenSim"
239
240 ;# {user_agent} {} {User agent to report to web servers?} {} OpenSim LSL (Mozilla Compatible)
241 ;; What is reported as the "User-Agent" when using llHTTPRequest
242 ;; Defaults to not sent if not set here. See the notes section in the wiki
243 ;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
244 ;; " (Mozilla Compatible)" to the text where there are problems with a web server
245 ; user_agent = "OpenSim LSL (Mozilla Compatible)"
246
247[ClientStack.LindenUDP]
248 ;; See OpensSimDefaults.ini for the throttle options. You can copy the
249 ;; relevant sections and override them here.
250 ;; DO NOT MODIFY OpenSimDefaults.ini, as your changes would be lost
251 ;; with the next update!
252
253 ;# {DisableFacelights} {} {Stop facelights from working?} {true false} false
254 ;; Quash and remove any light properties from attachments not on the
255 ;; hands. This allows flashlights and lanterns to function, but kills
256 ;; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
257 ;; will also be affected.
258 ;; This is especially important in artistic builds that depend on lights
259 ;; on the build for their appearance, since facelights will cause the
260 ;; building's lights to possibly not be rendered.
261 ; DisableFacelights = "false"
262
263[Chat]
264 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10
265 ;; Distance in meters that whispers should travel. Default is 10m
266 ; whisper_distance = 10
267
268 ;# {say_distance} {} {Distance at which normal chat is heard, in meters? (SL uses 20 here)} {} 30
269 ;; Distance in meters that ordinary chat should travel. Default is 30m
270 ; say_distance = 30
271
272 ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100
273 ;; Distance in meters that shouts should travel. Default is 100m
274 ; shout_distance = 100
275
276
277[Messaging]
278 ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule *}
279 ;; Module to handle offline messaging. The core module requires an external
280 ;; web service to do this. See OpenSim wiki.
281 ; OfflineMessageModule = OfflineMessageModule
282
283 ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule} {URL of offline messaging service} {}
284 ;; URL of web service for offline message storage
285 ; OfflineMessageURL = http://yourserver/Offline.php
286
287 ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
288 ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
289 ;; messages to work
290 ; MuteListModule = MuteListModule
291
292 ;# {MuteListURL} {OfflineMessageModule:OfflineMessageModule} {} {} http://yourserver/Mute.php
293 ;; URL of the web service that serves mute lists. Not currently used, but
294 ;; must be set to allow offline messaging to work.
295 ; MuteListURL = http://yourserver/Mute.php
296
297 ;; Control whether group messages are forwarded to offline users.
298 ;; Default is true.
299 ;; This applies to the core groups module (Flotsam) only.
300 ; ForwardOfflineGroupMessages = true
301
302
303[ODEPhysicsSettings]
304 ;# {mesh_sculpted_prim} {[Startup]physics:OpenDynamicsEngine} {Mesh sculpties so they collide as they look?} {true false} true
305 ;; Do we want to mesh sculpted prim to collide like they look?
306 ; mesh_sculpted_prim = true
307
308 ;# {use_NINJA_physics_joints} {[Startup]physics:OpenDynamicsEngine} {Use jointed (NINJA) physics?} {true false} false
309 ;; If you would like physics joints to be enabled through a special naming
310 ;; convention in the client, set this to true.
311 ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics)
312 ; use_NINJA_physics_joints = false
313
314
315[RemoteAdmin]
316 ;; This is the remote admin module, which uses XMLRPC requests to
317 ;; manage regions from a web interface.
318
319 ;# {enabled} {} {Enable the remote admin interface?} {true false} false
320 ; enabled = false
321
322 ;# {port} {enabled:true} {Port to use for the remote admin interface? (0 = default)} {} 0
323 ;; Set this to a nonzero value to have remote admin use a different port
324 ; port = 0
325
326 ;# {access_password} {enabled:true} {Password for the remote admin interface} {}
327 ;; This password is required to make any XMLRPC call (should be set as
328 ;; the "password" parameter)
329 ; access_password = ""
330
331 ;# {create_region_enable_voice} {enabled:true} {Enable voice for newly created regions?} {true false} false
332 ;; set this variable to true if you want the create_region XmlRpc
333 ;; call to unconditionally enable voice on all parcels for a newly
334 ;; created region [default: false]
335 ; create_region_enable_voice = false
336
337 ;# {create_region_public} {enabled:true} {Make newly created regions public?} {true false} false
338 ;; set this variable to false if you want the create_region XmlRpc
339 ;; call to create all regions as private per default (can be
340 ;; overridden in the XmlRpc call) [default: true]
341 ; create_region_public = false
342
343 ;# {enabled_methods} {enabled:true} {List of methods to allow, separated by |} {} all
344 ;; enable only those methods you deem to be appropriate using a | delimited
345 ;; whitelist.
346 ;; For example:
347 ;; enabled_methods = admin_broadcast|admin_save_oar|admin_save_xml
348 ;; if this parameter is not specified but enabled = true, all methods
349 ;; will be available
350 ; enabled_methods = all
351
352 ;; specify the default appearance for an avatar created through the remote
353 ;; admin interface
354 ;; This will only take effect is the file specified by the
355 ;; default_appearance setting below exists
356 ; default_male = Default Male
357 ; default_female = Default Female
358
359 ;; Update appearance copies inventory items and wearables of default
360 ;; avatars. if this value is false, just worn assets are copied to the
361 ;; Clothes folder; if true, all Clothes and Bodyparts subfolders are copied.
362 ;; The receiver will wear the same items the default avatar did wear.
363 ; copy_folders = false
364
365 ;; Path to default appearance XML file that specifies the look of the
366 ;; default avatars
367 ; default_appearance = default_appearance.xml
368
369[Wind]
370 ;# {enabled} {} {Enable wind module?} {true false} true
371 ;; Enables the wind module. Default is true
372 ;enabled = true
373
374 ;# {wind_update_rate} {enabled:true} {Wind update rate in frames?} {} 150
375 ;; How often should wind be updated, as a function of world frames.
376 ;; Approximately 50 frames a second
377 wind_update_rate = 150
378
379 ;; The Default Wind Plugin to load
380 ; wind_plugin = SimpleRandomWind
381
382 ;; These settings are specific to the ConfigurableWind plugin
383 ;; To use ConfigurableWind as the default, simply change wind_plugin
384 ;; to ConfigurableWind and uncomment the following.
385 ; avg_strength = 5.0
386 ; avg_direction = 0.0
387 ; var_strength = 0.0
388 ; var_direction = 0.0
389 ; rate_change = 1.0
390
391 ;# {strength} {enabled:true wind_plugin:SimpleRandomWind} {Wind strength?} {} 1.0
392 ;; This setting is specific to the SimpleRandomWind plugin
393 ;; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind. Default is 1.0
394 ; strength = 1.0
395
396[LightShare]
397 ;# {enable_windlight} {} {Enable LightShare technology?} {true false} false
398 ;; This enables the transmission of Windlight scenes to supporting clients,
399 ;; such as the Meta7 viewer.
400 ;; It has no ill effect on viewers which do not support server-side
401 ;; windlight settings.
402 ;; Currently we only have support for MySQL databases.
403 ; enable_windlight = false;
404
405[DataSnapshot]
406 ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
407 ;; The following set of configs pertains to search.
408 ;; Set index_sims to true to enable search engines to index your
409 ;; searchable data.
410 ;; If false, no data will be exposed, DataSnapshot module will be off,
411 ;; and you can ignore the rest of these search-related configs.
412 ; index_sims = false
413
414
415 ;# {data_exposure} {index_sims:true} {How much data should be exposed?} {minimum all} minimum
416 ;; The variable data_exposure controls what the regions expose:
417 ;; minimum: exposes only things explicitly marked for search
418 ;; all: exposes everything
419 ; data_exposure = minimum
420
421 ;# {gridname} {index_sims:true} {Enter the name fo your grid} {} OSGrid
422 ;; If search is on, change this to your grid name; will be ignored for
423 ;; standalones
424 ; gridname = "OSGrid"
425
426 ;# {default_snapshot_period} {index_sims:true} {Period between data snapshots?} {} 1200
427 ;; Period between data snapshots, in seconds. 20 minutes, for starters,
428 ;; so that you see the initial changes fast.
429 ;; Later, you may want to increase this to 3600 (1 hour) or more
430 ; default_snapshot_period = 1200
431
432 ;; This will be created in bin, if it doesn't exist already. It will hold
433 ;; the data snapshots.
434 ; snapshot_cache_directory = "DataSnapshot"
435
436 ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
437 ; This semicolon-separated string serves to notify specific data services
438 ; about the existence of this sim. Uncomment if you want to index your
439 ; data with this and/or other search providers.
440 ; data_services="http://metaverseink.com/cgi-bin/register.py"
441
442
443[Economy]
444 ;; The economy module is not enabled by default and there is no easy,
445 ;; menu controlled way to do this. To enabled this module, insert
446 ;; economymodule = BetaGridLikeMoneyModule
447 ;; into the startup section (at the top of this file).
448 ;; Then configure the options below as needed.
449
450 ;; Enables selling things for $0
451 ; SellEnabled = "false"
452
453 ;; Money Unit fee to upload textures, animations etc
454 ; PriceUpload = 0
455
456 ;; Money Unit fee to create groups
457 ; PriceGroupCreate = 0
458
459[XEngine]
460 ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} true
461 ;; Enable this engine in this OpenSim instance
462 ; Enabled = true
463
464 ;; How many threads to keep alive even if nothing is happening
465 ; MinThreads = 2
466
467 ;; How many threads to start at maximum load
468 ; MaxThreads = 100
469
470 ;; Time a thread must be idle (in seconds) before it dies
471 ; IdleTimeout = 60
472
473 ;# {Priority} {Enabled:true} {Priority for script engine threads?} {Lowest BelowNormal Normal AboveNormal Highest} BelowNormal
474 ;; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal",
475 ;; "Highest")
476 ; Priority = "BelowNormal"
477
478 ;; Maximum number of events to queue for a script (excluding timers)
479 ; MaxScriptEventQueue = 300
480
481 ;; Stack size per thread created
482 ; ThreadStackSize = 262144
483
484 ;; Set this to true (the default) to load each script into a separate
485 ;; AppDomain. Setting this to false will load all script assemblies into the
486 ;; current AppDomain, which will reduce the per-script overhead at the
487 ;; expense of reduced security and the inability to garbage collect the
488 ;; script assemblies
489 ; AppDomainLoading = true
490
491 ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl
492 ;; Default language for scripts
493 ; DefaultCompileLanguage = "lsl"
494
495 ;# {AllowedCompilers} {Enabled:true} {Languages to allow (comma separated)?} {} lsl
496 ;; List of allowed languages (lsl,vb,cs)
497 ;; AllowedCompilers=lsl,cs,js,vb.
498 ;; *warning*, non lsl languages have access to static methods such as
499 ;; System.IO.File. Enable at your own risk.
500 ; AllowedCompilers = "lsl"
501
502 ;; Compile debug info (line numbers) into the script assemblies
503 ; CompileWithDebugInformation = true
504
505 ;; Allow the user of mod* functions. This allows a script to pass messages
506 ;; to a region module via the modSendCommand() function
507 ;; Default is false
508 ; AllowMODFunctions = false
509
510 ;# {AllowOSFunctions} {Enabled:true} {Allow OSFunctions? (DANGEROUS!)} {true false} false
511 ;; Allow the use of os* functions (some are dangerous)
512 ; AllowOSFunctions = false
513
514 ;# {AllowLightShareFunctions} {Enabled:true [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} true
515 ; Allow the user of LightShare functions
516 ; AllowLightShareFunctions = false
517
518 ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow
519 ;; Threat level to allow, one of None, VeryLow, Low, Moderate, High,
520 ;; VeryHigh, Severe
521 OSFunctionThreatLevel = VeryLow
522
523 ;; Time a script can spend in an event handler before it is interrupted
524 ; EventLimit = 30
525
526 ;; If a script overruns it's event limit, kill the script?
527 ; KillTimedOutScripts = false
528
529 ;; Sets the multiplier for the scripting delays
530 ; ScriptDelayFactor = 1.0
531
532 ;; The factor the 10 m distances llimits are multiplied by
533 ; ScriptDistanceLimitFactor = 1.0
534
535 ;; Maximum length of notecard line read
536 ;; Increasing this to large values potentially opens
537 ;; up the system to malicious scripters
538 ; NotecardLineReadCharsMax = 255
539
540 ;; Sensor settings
541 ; SensorMaxRange = 96.0
542 ; SensorMaxResults = 16
543
544 ;; Disable underground movement of prims (default true); set to
545 ;; false to allow script controlled underground positioning of
546 ;; prims
547 ; DisableUndergroundMovement = true
548
549[MRM]
550 ;; Enables the Mini Region Modules Script Engine.
551 ;; default is false
552 ; Enabled = false
553
554 ;; Runs MRM in a Security Sandbox
555 ;; WARNING: DISABLING IS A SECURITY RISK.
556 ; Sandboxed = true
557
558 ;; The level sandbox to use, adjust at your OWN RISK.
559 ;; Valid values are:
560 ;; * FullTrust
561 ;; * SkipVerification
562 ;; * Execution
563 ;; * Nothing
564 ;; * LocalIntranet
565 ;; * Internet
566 ;; * Everything
567 ; SandboxLevel = "Internet"
568
569 ;; Only allow Region Owners to run MRMs
570 ;; May represent a security risk if you disable this.
571 ; OwnerOnly = true
572
573[FreeSwitchVoice]
574 ;; In order for this to work you need a functioning FreeSWITCH PBX set up.
575 ;; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
576 ; enabled = false
577
578 ;; FreeSWITCH server is going to contact us and ask us all sorts of things
579 ; freeswitch_server_user = freeswitch
580 ; freeswitch_server_pass = password
581 ; freeswitch_api_prefix = /api
582
583 ;; external IP address of your OpenSim voice enabled region
584 ;; note: all regions running on same OpenSim.exe will be enabled
585 ; freeswitch_service_server = ip.address.of.your.sim
586
587 ;; this should be the same port the region listens on
588 ; freeswitch_service_port = 9000
589 ; freeswitch_realm = ip.address.of.freeswitch.server
590 ; freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
591
592 ;; STUN = Simple Traversal of UDP through NATs
593 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
594 ;; stun.freeswitch.org is not guaranteed to be running so use it in
595 ;; production at your own risk
596 ; freeswitch_attempt_stun = false
597 ; freeswitch_stun_server = ip.address.of.stun.server
598 ; freeswitch_echo_server = ip.address.of.freeswitch.server
599 ; freeswitch_echo_port = 50505
600 ; freeswitch_well_known_ip = ip.address.of.freeswitch.server
601
602 ;; Type the address of your http server here, hostname is allowed.
603 ;; This is provided so you can specify a hostname
604 ;; This is used by client for account verification. By default, it's the
605 ;; same as the freeswitch service server.
606 ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server
607
608 ;; Timeouts
609 ; freeswitch_default_timeout = 5000
610 ; freeswitch_subscribe_retry = 120
611
612 ;; Misc
613 ; freeswitch_password_reset_url =
614
615[Groups]
616 ;# {Enabled} {} {Enable groups?} {true false} false
617 ;; Enables the groups module
618 ; Enabled = false
619
620 ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {} Default
621 ;; This is the current groups stub in Region.CoreModules.Avatar.Groups.
622 ;; All the other settings below only really apply to the Flotsam/SimianGrid
623 ;; GroupsModule.
624 ;; This module can use a PHP XmlRpc server from the Flotsam project at
625 ;; http://code.google.com/p/flotsam/
626 ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
627 ; Module = Default
628
629
630 ;; Service connectors to the Groups Service. Select one depending on
631 ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
632
633 ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups?} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
634 ;; The service connector to use for the GroupsModule
635 ; ServicesConnectorModule = SimianGroupsServicesConnector
636
637 ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI?} {}
638 ;; URI for the groups services
639 ; GroupsServerURI = ""
640
641 ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
642 ;; Enable Group Notices
643 ; NoticesEnabled = true
644
645 ;; This makes the Groups modules very chatty on the console.
646 ; DebugEnabled = false
647
648 ;; Specify which messaging module to use for groups messaging and if it's
649 ;; enabled
650 ; MessagingModule = GroupsMessagingModule
651 ; MessagingEnabled = true
652
653 ;; XmlRpc Security settings. These must match those set on your backend
654 ;; groups service.
655 ; XmlRpcServiceReadKey = 1234
656 ; XmlRpcServiceWriteKey = 1234
657
658[InterestManagement]
659 ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
660 ;; This section controls how state updates are prioritized for each client
661 ;; Valid values are BestAvatarResponsiveness, Time, Distance,
662 ;; SimpleAngularDistance, FrontBack
663 ; UpdatePrioritizationScheme = BestAvatarResponsiveness
664
665[MediaOnAPrim]
666 ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true
667 ;; Enable media on a prim facilities
668 ; Enabled = true;
669
670[Architecture]
671 ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
672 ;; Choose one of these architecture includes:
673 ;; Include-Architecture = "config-include/Standalone.ini"
674 ;; Include-Architecture = "config-include/StandaloneHypergrid.ini"
675 ;; Include-Architecture = "config-include/Grid.ini"
676 ;; Include-Architecture = "config-include/GridHypergrid.ini"
677 ;; Include-Architecture = "config-include/SimianGrid.ini"
678 ;; Include-Architecture = "config-include/HyperSimianGrid.ini"
679 ; Include-Architecture = "config-include/Standalone.ini"
680
681 ;; Then choose
682 ;; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
683 ;; config-include/GridCommon.ini.example (if you're connected to a grid)
684 ;; Copy to your own .ini there (without .example extension) and edit it
685 ;; to customize your data
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8d714ce..94d021d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -848,9 +848,6 @@
848 ; Enables selling things for $0 848 ; Enables selling things for $0
849 SellEnabled = "false" 849 SellEnabled = "false"
850 850
851 ; 45000 is the highest value that the sim could possibly report because of protocol constraints
852 ObjectCapacity = 45000
853
854 ; Money Unit fee to upload textures, animations etc 851 ; Money Unit fee to upload textures, animations etc
855 PriceUpload = 0 852 PriceUpload = 0
856 853
@@ -1228,8 +1225,9 @@
1228 1225
1229[InterestManagement] 1226[InterestManagement]
1230 ; This section controls how state updates are prioritized for each client 1227 ; This section controls how state updates are prioritized for each client
1231 ; Valid values are Time, Distance, SimpleAngularDistance, and FrontBack 1228 ; Valid values are BestAvatarResponsiveness, Time, Distance,
1232 UpdatePrioritizationScheme = FrontBack 1229 ; SimpleAngularDistance, and FrontBack
1230 UpdatePrioritizationScheme = BestAvatarResponsiveness
1233 ReprioritizationEnabled = true 1231 ReprioritizationEnabled = true
1234 ReprioritizationInterval = 2000.0 1232 ReprioritizationInterval = 2000.0
1235 RootReprioritizationDistance = 10.0 1233 RootReprioritizationDistance = 10.0
@@ -1266,34 +1264,3 @@
1266 ;; default standalone, overridable in StandaloneCommon.ini 1264 ;; default standalone, overridable in StandaloneCommon.ini
1267 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 1265 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1268 1266
1269 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1270 ;; The following is the configuration section for the new style services
1271 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1272[Architecture]
1273 ; Choose exactly one and only one of the architectures below.
1274
1275 Include-Standalone = "config-include/Standalone.ini"
1276 ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
1277 ;Include-Grid = "config-include/Grid.ini"
1278 ;Include-HGGrid = "config-include/GridHypergrid.ini"
1279 ;Include-SimianGrid = "config-include/SimianGrid.ini"
1280 ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
1281
1282 ; Then choose
1283 ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
1284 ; config-include/GridCommon.ini.example (if you're connected to a grid)
1285 ; Copy to your own .ini there (without .example extension) and edit it
1286 ; to customize your data
1287
1288
1289 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1290 ;; The below pulls in optional module config files
1291 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1292[Modules]
1293 Include-modules = "addon-modules/*/config/*.ini"
1294
1295
1296;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1297;; ENSURE [Architecture] and [Modules] Sections with their "includes"
1298;; are last to allow for overrides
1299;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4a6a082..1794573 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -14,7 +14,6 @@
14 AvatarServices = "RemoteAvatarServicesConnector" 14 AvatarServices = "RemoteAvatarServicesConnector"
15 NeighbourServices = "RemoteNeighbourServicesConnector" 15 NeighbourServices = "RemoteNeighbourServicesConnector"
16 AuthenticationServices = "RemoteAuthenticationServicesConnector" 16 AuthenticationServices = "RemoteAuthenticationServicesConnector"
17 AuthorizationServices = "RemoteAuthorizationServicesConnector"
18 PresenceServices = "RemotePresenceServicesConnector" 17 PresenceServices = "RemotePresenceServicesConnector"
19 UserAccountServices = "RemoteUserAccountServicesConnector" 18 UserAccountServices = "RemoteUserAccountServicesConnector"
20 GridUserServices = "RemoteGridUserServicesConnector" 19 GridUserServices = "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index c2cd5c3..3ab11b8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -93,3 +93,6 @@
93 ;; Optionally, the port for the LLProxyLoginModule module can be changed 93 ;; Optionally, the port for the LLProxyLoginModule module can be changed
94 94
95 ;Setup_LLProxyLoginModule = "9090/" 95 ;Setup_LLProxyLoginModule = "9090/"
96
97 ;; Authorization is not on by default, as it depends on external php
98 ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index d69a945..cb9ead4 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,7 +17,6 @@
17 AvatarServices = "RemoteAvatarServicesConnector" 17 AvatarServices = "RemoteAvatarServicesConnector"
18 NeighbourServices = "RemoteNeighbourServicesConnector" 18 NeighbourServices = "RemoteNeighbourServicesConnector"
19 AuthenticationServices = "RemoteAuthenticationServicesConnector" 19 AuthenticationServices = "RemoteAuthenticationServicesConnector"
20 AuthorizationServices = "RemoteAuthorizationServicesConnector"
21 PresenceServices = "RemotePresenceServicesConnector" 20 PresenceServices = "RemotePresenceServicesConnector"
22 UserAccountServices = "RemoteUserAccountServicesConnector" 21 UserAccountServices = "RemoteUserAccountServicesConnector"
23 GridUserServices = "RemoteGridUserServicesConnector" 22 GridUserServices = "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 96ef602..a810393 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -40,6 +40,9 @@
40 ;; Enable this to use Freeswitch on a standalone 40 ;; Enable this to use Freeswitch on a standalone
41 ;FreeswitchServiceInConnector = True 41 ;FreeswitchServiceInConnector = True
42 42
43 ;; Authorization is not on by default, as it depends on external php
44 ;AuthorizationServices = "LocalAuthorizationServicesConnector"
45
43[FreeswitchService] 46[FreeswitchService]
44 ;; Configuration for the freeswitch service goes here 47 ;; Configuration for the freeswitch service goes here
45 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 48 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"