aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example153
-rw-r--r--bin/OpenSimDefaults.ini69
-rw-r--r--bin/RegionConfig.ini.example1
-rw-r--r--bin/Robust.HG.ini.example38
-rw-r--r--bin/Robust.ini.example38
-rw-r--r--bin/config-include/StandaloneCommon.ini.example18
6 files changed, 209 insertions, 108 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 5bac56e..fbaa590 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1,4 +1,22 @@
1;; A note on the format of this file 1;; This is the main configuration file for OpenSimulator. If it's named OpenSim.ini
2;; then it will be loaded by OpenSimulator. If it's named OpenSim.ini.example then
3;; you will need to copy it to OpenSim.ini first (if that file does not already exist)
4;;
5;; If you are copying, then once you have copied OpenSim.ini.example to OpenSim.ini you will
6;; need to pick an architecture in the [Architecture] section at the end of this file.
7;;
8;; The settings in this file are in the form "<key> = <value>". For example, save_crashes = false
9;; in the [Startup] section below.
10;;
11;; All settings are initially commented out and the default value used, as found in
12;; OpenSimDefaults.ini. To change a setting, first uncomment it by deleting the initial semicolon (;)
13;; and then change the value. This will override the value in OpenSimDefaults.ini
14;;
15;; If you want to find out what configuration OpenSimulator has finished with once all the configuration
16;; files are loaded then type "config show" on the region console command line.
17;;
18;;
19;; NOTES FOR DEVELOPERS REGARDING THE FORMAT OF THIS FILE
2;; 20;;
3;; All leading white space is ignored, but preserved. 21;; All leading white space is ignored, but preserved.
4;; 22;;
@@ -8,15 +26,14 @@
8;; formatted as: 26;; formatted as:
9;; {option} {depends on} {question to ask} {choices} default value 27;; {option} {depends on} {question to ask} {choices} default value
10;; Any text comments following the declaration, up to the next blank line. 28;; Any text comments following the declaration, up to the next blank line.
11;; will be copied to the generated file. 29;; will be copied to the generated file (NOTE: generation is not yet implemented)
12;; A * in the choices list will allow an empty entry.\ 30;; A * in the choices list will allow an empty entry.
13;; An empty question will set the default if the dependencies are 31;; An empty question will set the default if the dependencies are
14;; satisfied. 32;; satisfied.
15;; 33;;
16;; ; denotes a commented out option. Uncomment it to actvate it 34;; ; denotes a commented out option.
17;; and change it to the desired value 35;; Any options added to OpenSim.ini.example should be initially commented out.
18;; Any options added to OpenSim.ini.exmaple must be commented out, 36
19;; and their value must represent the default.
20 37
21[Startup] 38[Startup]
22 ;# {save_crashes} {} {Save crashes to disk?} {true false} false 39 ;# {save_crashes} {} {Save crashes to disk?} {true false} false
@@ -35,7 +52,7 @@
35 52
36 ;; Determine where OpenSimulator looks for the files which tell it 53 ;; Determine where OpenSimulator looks for the files which tell it
37 ;; which regions to server 54 ;; which regions to server
38 ;; Defaults to "filesystem" if this setting isn't present 55 ;; Default is "filesystem"
39 ; region_info_source = "filesystem" 56 ; region_info_source = "filesystem"
40 ; region_info_source = "web" 57 ; region_info_source = "web"
41 58
@@ -131,6 +148,7 @@
131 ;; ZeroMesher is faster but leaves the physics engine to model the mesh 148 ;; ZeroMesher is faster but leaves the physics engine to model the mesh
132 ;; using the basic shapes that it supports. 149 ;; using the basic shapes that it supports.
133 ;; Usually this is only a box. 150 ;; Usually this is only a box.
151 ;; Default is Meshmerizer
134 ; meshing = Meshmerizer 152 ; meshing = Meshmerizer
135 ; meshing = ZeroMesher 153 ; meshing = ZeroMesher
136 154
@@ -138,6 +156,7 @@
138 ;; OpenDynamicsEngine is by some distance the most developed physics engine 156 ;; OpenDynamicsEngine is by some distance the most developed physics engine
139 ;; basicphysics effectively does not model physics at all, making all 157 ;; basicphysics effectively does not model physics at all, making all
140 ;; objects phantom 158 ;; objects phantom
159 ;; Default is OpenDynamicsEngine
141 ; physics = OpenDynamicsEngine 160 ; physics = OpenDynamicsEngine
142 ; physics = basicphysics 161 ; physics = basicphysics
143 ; physics = POS 162 ; physics = POS
@@ -154,7 +173,6 @@
154 ;; permission checks (allowing anybody to copy 173 ;; permission checks (allowing anybody to copy
155 ;; any item, etc. This may not yet be implemented uniformally. 174 ;; any item, etc. This may not yet be implemented uniformally.
156 ;; If set to true, then all permissions checks are carried out 175 ;; If set to true, then all permissions checks are carried out
157 ;; Default is false
158 ; serverside_object_permissions = false 176 ; serverside_object_permissions = false
159 177
160 ;; This allows users with a UserLevel of 200 or more to assume god 178 ;; This allows users with a UserLevel of 200 or more to assume god
@@ -183,11 +201,20 @@
183 ;; If not generating maptiles, use this static texture asset ID 201 ;; If not generating maptiles, use this static texture asset ID
184 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" 202 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
185 203
204 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
205 ; HttpProxy = "http://proxy.com:8080"
206
207 ;; If you're using HttpProxy, then you can set HttpProxyExceptions to a list of regular expressions for URLs that you don't want to go through the proxy
208 ;; For example, servers inside your firewall.
209 ;; Separate patterns with a ';'
210 ; HttpProxyExceptions = ".mydomain.com;localhost"
211
186 ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {true false} false 212 ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {true false} false
187 ;; The email module requires some configuration. It needs an SMTP 213 ;; The email module requires some configuration. It needs an SMTP
188 ;; server to send mail through. 214 ;; server to send mail through.
189 ; emailmodule = DefaultEmailModule 215 ; emailmodule = DefaultEmailModule
190 216
217
191[SMTP] 218[SMTP]
192 ;; The SMTP server enabled the email module to send email to external 219 ;; The SMTP server enabled the email module to send email to external
193 ;; destinations. 220 ;; destinations.
@@ -214,6 +241,7 @@
214 ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {} 241 ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
215 ; SMTP_SERVER_PASSWORD = "" 242 ; SMTP_SERVER_PASSWORD = ""
216 243
244
217[Network] 245[Network]
218 ;; Configure the remote console user here. This will not actually be used 246 ;; Configure the remote console user here. This will not actually be used
219 ;; unless you use -console=rest at startup. 247 ;; unless you use -console=rest at startup.
@@ -247,6 +275,7 @@
247 ;; " (Mozilla Compatible)" to the text where there are problems with a web server 275 ;; " (Mozilla Compatible)" to the text where there are problems with a web server
248 ; user_agent = "OpenSim LSL (Mozilla Compatible)" 276 ; user_agent = "OpenSim LSL (Mozilla Compatible)"
249 277
278
250[ClientStack.LindenUDP] 279[ClientStack.LindenUDP]
251 ;; See OpensSimDefaults.ini for the throttle options. You can copy the 280 ;; See OpensSimDefaults.ini for the throttle options. You can copy the
252 ;; relevant sections and override them here. 281 ;; relevant sections and override them here.
@@ -263,17 +292,18 @@
263 ;; building's lights to possibly not be rendered. 292 ;; building's lights to possibly not be rendered.
264 ; DisableFacelights = "false" 293 ; DisableFacelights = "false"
265 294
295
266[Chat] 296[Chat]
267 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10 297 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10
268 ;; Distance in meters that whispers should travel. Default is 10m 298 ;; Distance in meters that whispers should travel.
269 ; whisper_distance = 10 299 ; whisper_distance = 10
270 300
271 ;# {say_distance} {} {Distance at which normal chat is heard, in meters? (SL uses 20 here)} {} 30 301 ;# {say_distance} {} {Distance at which normal chat is heard, in meters? (SL uses 20 here)} {} 30
272 ;; Distance in meters that ordinary chat should travel. Default is 30m 302 ;; Distance in meters that ordinary chat should travel.
273 ; say_distance = 30 303 ; say_distance = 30
274 304
275 ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100 305 ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100
276 ;; Distance in meters that shouts should travel. Default is 100m 306 ;; Distance in meters that shouts should travel.
277 ; shout_distance = 100 307 ; shout_distance = 100
278 308
279 309
@@ -337,13 +367,13 @@
337 ;# {create_region_enable_voice} {enabled:true} {Enable voice for newly created regions?} {true false} false 367 ;# {create_region_enable_voice} {enabled:true} {Enable voice for newly created regions?} {true false} false
338 ;; set this variable to true if you want the create_region XmlRpc 368 ;; set this variable to true if you want the create_region XmlRpc
339 ;; call to unconditionally enable voice on all parcels for a newly 369 ;; call to unconditionally enable voice on all parcels for a newly
340 ;; created region [default: false] 370 ;; created region
341 ; create_region_enable_voice = false 371 ; create_region_enable_voice = false
342 372
343 ;# {create_region_public} {enabled:true} {Make newly created regions public?} {true false} false 373 ;# {create_region_public} {enabled:true} {Make newly created regions public?} {true false} false
344 ;; set this variable to false if you want the create_region XmlRpc 374 ;; set this variable to false if you want the create_region XmlRpc
345 ;; call to create all regions as private per default (can be 375 ;; call to create all regions as private per default (can be
346 ;; overridden in the XmlRpc call) [default: true] 376 ;; overridden in the XmlRpc call)
347 ; create_region_public = false 377 ; create_region_public = false
348 378
349 ;# {enabled_methods} {enabled:true} {List of methods to allow, separated by |} {} all 379 ;# {enabled_methods} {enabled:true} {List of methods to allow, separated by |} {} all
@@ -372,15 +402,16 @@
372 ;; default avatars 402 ;; default avatars
373 ; default_appearance = default_appearance.xml 403 ; default_appearance = default_appearance.xml
374 404
405
375[Wind] 406[Wind]
376 ;# {enabled} {} {Enable wind module?} {true false} true 407 ;# {enabled} {} {Enable wind module?} {true false} true
377 ;; Enables the wind module. Default is true 408 ;; Enables the wind module.
378 ;enabled = true 409 ; enabled = true
379 410
380 ;# {wind_update_rate} {enabled:true} {Wind update rate in frames?} {} 150 411 ;# {wind_update_rate} {enabled:true} {Wind update rate in frames?} {} 150
381 ;; How often should wind be updated, as a function of world frames. 412 ;; How often should wind be updated, as a function of world frames.
382 ;; Approximately 50 frames a second 413 ;; Approximately 50 frames a second
383 wind_update_rate = 150 414 ; wind_update_rate = 150
384 415
385 ;; The Default Wind Plugin to load 416 ;; The Default Wind Plugin to load
386 ; wind_plugin = SimpleRandomWind 417 ; wind_plugin = SimpleRandomWind
@@ -396,9 +427,10 @@
396 427
397 ;# {strength} {enabled:true wind_plugin:SimpleRandomWind} {Wind strength?} {} 1.0 428 ;# {strength} {enabled:true wind_plugin:SimpleRandomWind} {Wind strength?} {} 1.0
398 ;; This setting is specific to the SimpleRandomWind plugin 429 ;; This setting is specific to the SimpleRandomWind plugin
399 ;; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind. Default is 1.0 430 ;; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind.
400 ; strength = 1.0 431 ; strength = 1.0
401 432
433
402[LightShare] 434[LightShare]
403 ;# {enable_windlight} {} {Enable LightShare technology?} {true false} false 435 ;# {enable_windlight} {} {Enable LightShare technology?} {true false} false
404 ;; This enables the transmission of Windlight scenes to supporting clients, 436 ;; This enables the transmission of Windlight scenes to supporting clients,
@@ -406,7 +438,8 @@
406 ;; It has no ill effect on viewers which do not support server-side 438 ;; It has no ill effect on viewers which do not support server-side
407 ;; windlight settings. 439 ;; windlight settings.
408 ;; Currently we only have support for MySQL databases. 440 ;; Currently we only have support for MySQL databases.
409 ; enable_windlight = false; 441 ; enable_windlight = false
442
410 443
411[DataSnapshot] 444[DataSnapshot]
412 ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false 445 ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
@@ -417,7 +450,6 @@
417 ;; and you can ignore the rest of these search-related configs. 450 ;; and you can ignore the rest of these search-related configs.
418 ; index_sims = false 451 ; index_sims = false
419 452
420
421 ;# {data_exposure} {index_sims:true} {How much data should be exposed?} {minimum all} minimum 453 ;# {data_exposure} {index_sims:true} {How much data should be exposed?} {minimum all} minimum
422 ;; The variable data_exposure controls what the regions expose: 454 ;; The variable data_exposure controls what the regions expose:
423 ;; minimum: exposes only things explicitly marked for search 455 ;; minimum: exposes only things explicitly marked for search
@@ -462,6 +494,7 @@
462 ;; Money Unit fee to create groups 494 ;; Money Unit fee to create groups
463 ; PriceGroupCreate = 0 495 ; PriceGroupCreate = 0
464 496
497
465[XEngine] 498[XEngine]
466 ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} true 499 ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} true
467 ;; Enable this engine in this OpenSim instance 500 ;; Enable this engine in this OpenSim instance
@@ -556,9 +589,9 @@
556 ;; Default is ./bin/ScriptEngines 589 ;; Default is ./bin/ScriptEngines
557 ; ScriptEnginesPath = "ScriptEngines" 590 ; ScriptEnginesPath = "ScriptEngines"
558 591
592
559[MRM] 593[MRM]
560 ;; Enables the Mini Region Modules Script Engine. 594 ;; Enables the Mini Region Modules Script Engine.
561 ;; default is false
562 ; Enabled = false 595 ; Enabled = false
563 596
564 ;; Runs MRM in a Security Sandbox 597 ;; Runs MRM in a Security Sandbox
@@ -580,6 +613,7 @@
580 ;; May represent a security risk if you disable this. 613 ;; May represent a security risk if you disable this.
581 ; OwnerOnly = true 614 ; OwnerOnly = true
582 615
616
583[FreeSwitchVoice] 617[FreeSwitchVoice]
584 ;; In order for this to work you need a functioning FreeSWITCH PBX set up. 618 ;; In order for this to work you need a functioning FreeSWITCH PBX set up.
585 ;; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module 619 ;; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
@@ -587,29 +621,49 @@
587 621
588 ;; You need to load a local service for a standalone, and a remote service 622 ;; You need to load a local service for a standalone, and a remote service
589 ;; for a grid region. Use one of the lines below, as appropriate 623 ;; for a grid region. Use one of the lines below, as appropriate
624 ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section
590 ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService 625 ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService
591 ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector 626 ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector
592 627
593 ;; If using a remote module, specify the server URL 628 ;; If using a remote connector, specify the server URL
594 ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi 629 ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi
595 630
631
596[FreeswitchService] 632[FreeswitchService]
597 ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! 633 ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
598 ;; !!!!!!STANDALONE ONLY!!!!!! 634 ;; !!!!!!STANDALONE ONLY!!!!!!
599 ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! 635 ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
600 ;; IP of your FS server 636 ;; The IP address of your FreeSWITCH server. The common case is for this to be the same as the server running the OpenSim standalone
601 ;ServerAddress = 85.25.142.92 637 ;; This has to be set for the FreeSWITCH service to work
638 ;ServerAddress = 127.0.0.1
602 639
603 ;; All other options are - well - optional 640 ;; The following configuration parameters are optional
604 ; Realm = "127.0.0.1" 641
605 ; SIPProxy = "127.0.0.1:5060" 642 ;; By default, this is the same as the ServerAddress
606 ; EchoServer = "127.0.0.1" 643 ; Realm = 127.0.0.1
607 ; EchoPort = 50505 644
608 ; AttemptSTUN = "false" 645 ;; By default, this is the same as the ServerAddress on port 5060
646 ; SIPProxy = 127.0.0.1:5060
647
648 ;; Default is 5000ms
609 ; DefaultTimeout = 5000 649 ; DefaultTimeout = 5000
610 ; Context = "default" 650
611 ; UserName = "freeswitch" 651 ;; The dial plan context. Default is "default"
612 ; Password = "password" 652 ; Context = default
653
654 ;; Currently unused
655 ; UserName = freeswitch
656
657 ;; Currently unused
658 ; Password = password
659
660 ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
661 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
662 ;; stun.freeswitch.org is not guaranteed to be running so use it in
663 ;; production at your own risk
664 ; EchoServer = 127.0.0.1
665 ; EchoPort = 50505
666 ; AttemptSTUN = false
613 667
614[Groups] 668[Groups]
615 ;# {Enabled} {} {Enable groups?} {true false} false 669 ;# {Enabled} {} {Enable groups?} {true false} false
@@ -634,7 +688,7 @@
634 ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector 688 ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
635 ;; Service connectors to the Groups Service as used in the GroupsModule. Select one depending on 689 ;; Service connectors to the Groups Service as used in the GroupsModule. Select one depending on
636 ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend 690 ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
637 ; ServicesConnectorModule = SimianGroupsServicesConnector 691 ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
638 692
639 ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {} 693 ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
640 ;; URI for the groups services 694 ;; URI for the groups services
@@ -654,6 +708,7 @@
654 ; XmlRpcServiceReadKey = 1234 708 ; XmlRpcServiceReadKey = 1234
655 ; XmlRpcServiceWriteKey = 1234 709 ; XmlRpcServiceWriteKey = 1234
656 710
711
657[InterestManagement] 712[InterestManagement]
658 ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness 713 ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
659 ;; This section controls how state updates are prioritized for each client 714 ;; This section controls how state updates are prioritized for each client
@@ -661,24 +716,28 @@
661 ;; SimpleAngularDistance, FrontBack 716 ;; SimpleAngularDistance, FrontBack
662 ; UpdatePrioritizationScheme = BestAvatarResponsiveness 717 ; UpdatePrioritizationScheme = BestAvatarResponsiveness
663 718
719
664[MediaOnAPrim] 720[MediaOnAPrim]
665 ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true 721 ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true
666 ;; Enable media on a prim facilities 722 ;; Enable media on a prim facilities
667 ; Enabled = true; 723 ; Enabled = true;
668 724
725
669[Architecture] 726[Architecture]
670 ;# {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 727 ;# {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
671 ;; Choose one of these architecture includes: 728 ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim,
672 ;; Include-Architecture = "config-include/Standalone.ini" 729 ;; uncomment Include-Architecture = "config-include/Standalone.ini"
673 ;; Include-Architecture = "config-include/StandaloneHypergrid.ini" 730 ;;
674 ;; Include-Architecture = "config-include/Grid.ini" 731 ;; Then you will need to copy and edit the corresponding *Common.example file in config-include/
675 ;; Include-Architecture = "config-include/GridHypergrid.ini" 732 ;; that the referenced .ini file goes on to include.
676 ;; Include-Architecture = "config-include/SimianGrid.ini" 733 ;;
677 ;; Include-Architecture = "config-include/HyperSimianGrid.ini" 734 ;; For instance, if you chose "config-include/Standalone.ini" then you will need to copy
735 ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before
736 ;; editing it to set the database and backend services that OpenSim will use.
737 ;;
678 ; Include-Architecture = "config-include/Standalone.ini" 738 ; Include-Architecture = "config-include/Standalone.ini"
679 739 ; Include-Architecture = "config-include/StandaloneHypergrid.ini"
680 ;; Then choose 740 ; Include-Architecture = "config-include/Grid.ini"
681 ;; config-include/StandaloneCommon.ini.example (if you're in standlone) OR 741 ; Include-Architecture = "config-include/GridHypergrid.ini"
682 ;; config-include/GridCommon.ini.example (if you're connected to a grid) 742 ; Include-Architecture = "config-include/SimianGrid.ini"
683 ;; Copy to your own .ini there (without .example extension) and edit it 743 ; Include-Architecture = "config-include/HyperSimianGrid.ini"
684 ;; to customize your data
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index db4bb6a..02fa7c5 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,3 +1,7 @@
1; This file contains defaults for various settings in OpenSimulator. These can be overriden
2; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
3
4
1[Startup] 5[Startup]
2 ; Set this to true if you want to log crashes to disk 6 ; Set this to true if you want to log crashes to disk
3 ; this can be useful when submitting bug reports. 7 ; this can be useful when submitting bug reports.
@@ -10,15 +14,6 @@
10 ; Place to create a PID file 14 ; Place to create a PID file
11 ; PIDFile = "/tmp/my.pid" 15 ; PIDFile = "/tmp/my.pid"
12 16
13 ; Http proxy support for llHTTPRequest and dynamic texture loading
14 ; Set HttpProxy to the URL for your proxy server if you would like
15 ; to proxy llHTTPRequests through a firewall
16 ; HttpProxy = "http://proxy.com"
17 ; Set HttpProxyExceptions to a list of regular expressions for
18 ; URLs that you don't want going through the proxy such as servers
19 ; inside your firewall, separate patterns with a ';'
20 ; HttpProxyExceptions = ".mydomain.com;localhost"
21
22 startup_console_commands_file = "startup_commands.txt" 17 startup_console_commands_file = "startup_commands.txt"
23 shutdown_console_commands_file = "shutdown_commands.txt" 18 shutdown_console_commands_file = "shutdown_commands.txt"
24 19
@@ -154,12 +149,6 @@
154 ; to false if you have compatibility problems. 149 ; to false if you have compatibility problems.
155 ;CacheSculptMaps = true 150 ;CacheSculptMaps = true
156 151
157 ; if you use Meshmerizer and want collisions for meshies, setting this to true
158 ; will cause OpenSim to attempt to decode meshies assets, extract the physics
159 ; mesh, and use it for collisions. This is currently experimental code and enabling
160 ; it may cause unexpected physics problems.
161 ;UseMeshiesPhysicsMesh = false
162
163 ; Choose one of the physics engines below 152 ; Choose one of the physics engines below
164 ; OpenDynamicsEngine is by some distance the most developed physics engine 153 ; OpenDynamicsEngine is by some distance the most developed physics engine
165 ; basicphysics effectively does not model physics at all, making all objects phantom 154 ; basicphysics effectively does not model physics at all, making all objects phantom
@@ -287,6 +276,7 @@
287 ;SMTP_SERVER_LOGIN=foo 276 ;SMTP_SERVER_LOGIN=foo
288 ;SMTP_SERVER_PASSWORD=bar 277 ;SMTP_SERVER_PASSWORD=bar
289 278
279
290[Network] 280[Network]
291 ConsoleUser = "Test" 281 ConsoleUser = "Test"
292 ConsolePass = "secret" 282 ConsolePass = "secret"
@@ -317,6 +307,7 @@
317 ; " (Mozilla Compatible)" to the text where there are problems with a web server 307 ; " (Mozilla Compatible)" to the text where there are problems with a web server
318 ;user_agent = "OpenSim LSL (Mozilla Compatible)" 308 ;user_agent = "OpenSim LSL (Mozilla Compatible)"
319 309
310
320[XMLRPC] 311[XMLRPC]
321 ; ## 312 ; ##
322 ; ## Scripting XMLRPC mapper 313 ; ## Scripting XMLRPC mapper
@@ -330,6 +321,7 @@
330 ;XmlRpcRouterModule = "XmlRpcRouterModule" 321 ;XmlRpcRouterModule = "XmlRpcRouterModule"
331 ;XmlRpcPort = 20800 322 ;XmlRpcPort = 20800
332 323
324
333[ClientStack.LindenUDP] 325[ClientStack.LindenUDP]
334 ; Set this to true to process incoming packets asynchronously. Networking is 326 ; Set this to true to process incoming packets asynchronously. Networking is
335 ; already separated from packet handling with a queue, so this will only 327 ; already separated from packet handling with a queue, so this will only
@@ -422,6 +414,7 @@
422 ; 414 ;
423 ;DisableFacelights = "false" 415 ;DisableFacelights = "false"
424 416
417
425[Chat] 418[Chat]
426 ; Controls whether the chat module is enabled. Default is true. 419 ; Controls whether the chat module is enabled. Default is true.
427 enabled = true; 420 enabled = true;
@@ -450,6 +443,25 @@
450 ; ForwardOfflineGroupMessages = true 443 ; ForwardOfflineGroupMessages = true
451 444
452 445
446[Inventory]
447 ; Control whether multiple objects sent to inventory should be coaleseced into a single item
448 ; There are still some issues with coalescence, including the fact that rotation is not restored
449 ; and some assets may be missing from archive files.
450 CoalesceMultipleObjectsToInventory = true
451
452
453[Mesh]
454 ; enable / disable Collada mesh support
455 ; default is true
456 ; AllowMeshUpload = true
457
458 ; if you use Meshmerizer and want collisions for meshies, setting this to true
459 ; will cause OpenSim to attempt to decode meshies assets, extract the physics
460 ; mesh, and use it for collisions. This is currently experimental code and enabling
461 ; it may cause unexpected physics problems.
462 ;UseMeshiesPhysicsMesh = false
463
464
453[ODEPhysicsSettings] 465[ODEPhysicsSettings]
454 ;## 466 ;##
455 ;## World Settings 467 ;## World Settings
@@ -680,6 +692,7 @@
680 ; path to default appearance XML file that specifies the look of the default avatars 692 ; path to default appearance XML file that specifies the look of the default avatars
681 ;default_appearance = default_appearance.xml 693 ;default_appearance = default_appearance.xml
682 694
695
683[RestPlugins] 696[RestPlugins]
684 ; Change this to true to enable REST Plugins. This must be true if you wish to use 697 ; Change this to true to enable REST Plugins. This must be true if you wish to use
685 ; REST Region or REST Asset and Inventory Plugins 698 ; REST Region or REST Asset and Inventory Plugins
@@ -706,11 +719,10 @@
706 flush-on-error = true 719 flush-on-error = true
707 720
708 721
709; Uncomment the following for IRC bridge 722; IRC bridge is experimental, so if it breaks... keep both parts... yada yada
710; experimental, so if it breaks... keep both parts... yada yada
711; also, not good error detection when it fails 723; also, not good error detection when it fails
712;[IRC] 724[IRC]
713 ;enabled = true ; you need to set this otherwise it won't connect 725 enabled = false; you need to set this to true otherwise it won't connect
714 ;server = name.of.irc.server.on.the.net 726 ;server = name.of.irc.server.on.the.net
715 ;; user password - only use this if the server requires one 727 ;; user password - only use this if the server requires one
716 ;password = mypass 728 ;password = mypass
@@ -767,14 +779,14 @@
767 ;exclude_list=User 1,User 2,User 3 779 ;exclude_list=User 1,User 2,User 3
768 780
769 781
770;[CMS] 782[CMS]
771 ;enabled = true 783 enabled = false
772 ;channel = 345 784 ;channel = 345
773 785
774 786
775; Uncomment the following to control the progression of daytime 787; The following settings control the progression of daytime
776; in the Sim. The defaults are what is shown below 788; in the Sim. The defaults are the same as the commented out settings
777;[Sun] 789[Sun]
778 ; number of wall clock hours for an opensim day. 24.0 would mean realtime 790 ; number of wall clock hours for an opensim day. 24.0 would mean realtime
779 ;day_length = 4 791 ;day_length = 4
780 ; Year length in days 792 ; Year length in days
@@ -821,12 +833,13 @@
821 ; default is 1000 833 ; default is 1000
822 cloud_update_rate = 1000 834 cloud_update_rate = 1000
823 835
824[LightShare]
825 836
837[LightShare]
826 ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer. 838 ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
827 ; It has no ill effect on viewers which do not support server-side windlight settings. 839 ; It has no ill effect on viewers which do not support server-side windlight settings.
828 ; Currently we only have support for MySQL databases. 840 ; Currently we only have support for MySQL databases.
829 enable_windlight = false; 841 enable_windlight = false
842
830 843
831[Trees] 844[Trees]
832 ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying 845 ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
@@ -838,7 +851,6 @@
838 851
839 852
840[VectorRender] 853[VectorRender]
841
842 ; the font to use for rendering text (default: Arial) 854 ; the font to use for rendering text (default: Arial)
843 ; font_name = "Arial" 855 ; font_name = "Arial"
844 856
@@ -1032,6 +1044,7 @@
1032 ;; Path to script assemblies 1044 ;; Path to script assemblies
1033 ; ScriptEnginesPath = "ScriptEngines" 1045 ; ScriptEnginesPath = "ScriptEngines"
1034 1046
1047
1035[OpenGridProtocol] 1048[OpenGridProtocol]
1036 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. 1049 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
1037 ;On/true or Off/false 1050 ;On/true or Off/false
@@ -1240,11 +1253,11 @@
1240 ChildReprioritizationDistance = 20.0 1253 ChildReprioritizationDistance = 20.0
1241 1254
1242 1255
1243[WebStats]
1244; View region statistics via a web page 1256; View region statistics via a web page
1245; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page 1257; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
1246; Use a web browser and type in the "Login URI" + "/SStats/" 1258; Use a web browser and type in the "Login URI" + "/SStats/"
1247; For example- http://127.0.0.1:9000/SStats/ 1259; For example- http://127.0.0.1:9000/SStats/
1260[WebStats]
1248; enabled=false 1261; enabled=false
1249 1262
1250 1263
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example
index d45fe9d..ff00ddf 100644
--- a/bin/RegionConfig.ini.example
+++ b/bin/RegionConfig.ini.example
@@ -28,6 +28,7 @@ ExternalHostName = "SYSTEMIP"
28; PhysicalPrimMax = 10 28; PhysicalPrimMax = 10
29; ClampPrimSize = False 29; ClampPrimSize = False
30; MaxPrims = 15000 30; MaxPrims = 15000
31; MaxAgents = 100
31 32
32; * 33; *
33; * Multi-Tenancy. Only set if needed 34; * Multi-Tenancy. Only set if needed
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index f12a143..e2e9624 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -85,19 +85,37 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
85; * This is the configuration for the freeswitch server in grid mode 85; * This is the configuration for the freeswitch server in grid mode
86[FreeswitchService] 86[FreeswitchService]
87 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 87 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
88 ;; IP of your FS server 88
89 ;; The IP address of your FreeSWITCH server.
89 ; ServerAddress = 127.0.0.1 90 ; ServerAddress = 127.0.0.1
90 91
91 ;; All other options are - well - optional 92 ;; The following configuration parameters are optional
92 ; Realm = "127.0.0.1" 93
93 ; SIPProxy = "127.0.0.1:5060" 94 ;; By default, this is the same as the ServerAddress
94 ; EchoServer = "127.0.0.1" 95 ; Realm = 127.0.0.1
95 ; EchoPort = 50505 96
96 ; AttemptSTUN = "false" 97 ;; By default, this is the same as the ServerAddress on port 5060
98 ; SIPProxy = 127.0.0.1:5060
99
100 ;; Default is 5000ms
97 ; DefaultTimeout = 5000 101 ; DefaultTimeout = 5000
98 ; Context = "default" 102
99 ; UserName = "freeswitch" 103 ;; The dial plan context. Default is "default"
100 ; Password = "password" 104 ; Context = default
105
106 ;; Currently unused
107 ; UserName = freeswitch
108
109 ;; Currently unused
110 ; Password = password
111
112 ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
113 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
114 ;; stun.freeswitch.org is not guaranteed to be running so use it in
115 ;; production at your own risk
116 ; EchoServer = 127.0.0.1
117 ; EchoPort = 50505
118 ; AttemptSTUN = false
101 119
102; * This is the new style authentication service. Currently, only MySQL 120; * This is the new style authentication service. Currently, only MySQL
103; * is implemented. 121; * is implemented.
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7c13076..4d16236 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -69,19 +69,37 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
69; * This is the configuration for the freeswitch server in grid mode 69; * This is the configuration for the freeswitch server in grid mode
70[FreeswitchService] 70[FreeswitchService]
71 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 71 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
72 ;; IP of your FS server 72
73 ;; The IP address of your FreeSWITCH server.
73 ; ServerAddress = 127.0.0.1 74 ; ServerAddress = 127.0.0.1
74 75
75 ;; All other options are - well - optional 76 ;; The following configuration parameters are optional
76 ; Realm = "127.0.0.1" 77
77 ; SIPProxy = "127.0.0.1:5060" 78 ;; By default, this is the same as the ServerAddress
78 ; EchoServer = "127.0.0.1" 79 ; Realm = 127.0.0.1
79 ; EchoPort = 50505 80
80 ; AttemptSTUN = "false" 81 ;; By default, this is the same as the ServerAddress on port 5060
82 ; SIPProxy = 127.0.0.1:5060
83
84 ;; Default is 5000ms
81 ; DefaultTimeout = 5000 85 ; DefaultTimeout = 5000
82 ; Context = "default" 86
83 ; UserName = "freeswitch" 87 ;; The dial plan context. Default is "default"
84 ; Password = "password" 88 ; Context = default
89
90 ;; Currently unused
91 ; UserName = freeswitch
92
93 ;; Currently unused
94 ; Password = password
95
96 ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
97 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
98 ;; stun.freeswitch.org is not guaranteed to be running so use it in
99 ;; production at your own risk
100 ; EchoServer = 127.0.0.1
101 ; EchoPort = 50505
102 ; AttemptSTUN = false
85 103
86; * This is the new style authentication service. Currently, only MySQL 104; * This is the new style authentication service. Currently, only MySQL
87; * is implemented. 105; * is implemented.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d6f15bb..dcebd63 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -28,10 +28,10 @@
28 28
29[HGInventoryAccessModule] 29[HGInventoryAccessModule]
30 ProfileServerURI = "http://127.0.0.1:9000/profiles" 30 ProfileServerURI = "http://127.0.0.1:9000/profiles"
31 ;; If you want to protect your assets from being copied by foreign visitors
32 ;; uncomment the next line. You may want to do this on sims that have licensed content.
33 ; OutboundPermission = False
34 31
32 ;; If you want to protect your assets from being copied by foreign visitors
33 ;; uncomment the next line. You may want to do this on sims that have licensed content.
34 ; OutboundPermission = False
35 35
36[Modules] 36[Modules]
37 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 37 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
@@ -45,16 +45,9 @@
45 AssetCaching = "CenomeMemoryAssetCache" 45 AssetCaching = "CenomeMemoryAssetCache"
46 Include-CenomeCache = "config-include/CenomeCache.ini" 46 Include-CenomeCache = "config-include/CenomeCache.ini"
47 47
48 ;; Enable this to use Freeswitch on a standalone
49 ;FreeswitchServiceInConnector = True
50
51 ;; Authorization is not on by default, as it depends on external php 48 ;; Authorization is not on by default, as it depends on external php
52 ;AuthorizationServices = "LocalAuthorizationServicesConnector" 49 ;AuthorizationServices = "LocalAuthorizationServicesConnector"
53 50
54[FreeswitchService]
55 ;; Configuration for the freeswitch service goes here
56 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
57
58[GridService] 51[GridService]
59 ;; For in-memory region storage (default) 52 ;; For in-memory region storage (default)
60 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 53 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
@@ -74,9 +67,8 @@
74 Region_Welcome_Area = "DefaultRegion, FallbackRegion" 67 Region_Welcome_Area = "DefaultRegion, FallbackRegion"
75 68
76 ; === HG ONLY === 69 ; === HG ONLY ===
77 ;; change this to the address of your simulator 70 ;; change this to the address of your simulator
78 Gatekeeper="http://127.0.0.1:9000" 71 Gatekeeper="http://127.0.0.1:9000"
79
80 72
81[LibraryModule] 73[LibraryModule]
82 ; Set this if you want to change the name of the OpenSim Library 74 ; Set this if you want to change the name of the OpenSim Library