diff options
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Mono.Data.Sqlite.dll.config | 5 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 111 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 44 | ||||
-rw-r--r-- | bin/System.Data.SQLite.dll | bin | 159232 -> 0 bytes | |||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 11 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 10 | ||||
-rw-r--r-- | bin/config-include/storage/SQLiteLegacyStandalone.ini | 20 | ||||
-rw-r--r-- | bin/libode.dylib | bin | 1024996 -> 2916380 bytes | |||
-rwxr-xr-x | bin/libsqlite3.dylib | bin | 0 -> 2175300 bytes | |||
-rw-r--r-- | bin/libsqlite3.txt | 1 | ||||
-rwxr-xr-x | bin/libsqlite3_32.so | bin | 0 -> 635852 bytes | |||
-rwxr-xr-x | bin/libsqlite3_64.so | bin | 0 -> 783200 bytes | |||
-rw-r--r-- | bin/sqlite-3.6.21.so | bin | 392316 -> 0 bytes |
13 files changed, 115 insertions, 87 deletions
diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config new file mode 100644 index 0000000..ccc0cf5 --- /dev/null +++ b/bin/Mono.Data.Sqlite.dll.config | |||
@@ -0,0 +1,5 @@ | |||
1 | <configuration> | ||
2 | <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" /> | ||
3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" /> | ||
4 | <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" /> | ||
5 | </configuration> | ||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 5bac56e..c05c3de 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 |
@@ -593,6 +627,7 @@ | |||
593 | ;; If using a remote module, specify the server URL | 627 | ;; If using a remote module, specify the server URL |
594 | ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi | 628 | ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi |
595 | 629 | ||
630 | |||
596 | [FreeswitchService] | 631 | [FreeswitchService] |
597 | ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! | 632 | ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! |
598 | ;; !!!!!!STANDALONE ONLY!!!!!! | 633 | ;; !!!!!!STANDALONE ONLY!!!!!! |
@@ -611,6 +646,7 @@ | |||
611 | ; UserName = "freeswitch" | 646 | ; UserName = "freeswitch" |
612 | ; Password = "password" | 647 | ; Password = "password" |
613 | 648 | ||
649 | |||
614 | [Groups] | 650 | [Groups] |
615 | ;# {Enabled} {} {Enable groups?} {true false} false | 651 | ;# {Enabled} {} {Enable groups?} {true false} false |
616 | ;; Enables the groups module | 652 | ;; Enables the groups module |
@@ -634,7 +670,7 @@ | |||
634 | ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector | 670 | ;# {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 | 671 | ;; 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 | 672 | ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend |
637 | ; ServicesConnectorModule = SimianGroupsServicesConnector | 673 | ; ServicesConnectorModule = XmlRpcGroupsServicesConnector |
638 | 674 | ||
639 | ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {} | 675 | ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {} |
640 | ;; URI for the groups services | 676 | ;; URI for the groups services |
@@ -654,6 +690,7 @@ | |||
654 | ; XmlRpcServiceReadKey = 1234 | 690 | ; XmlRpcServiceReadKey = 1234 |
655 | ; XmlRpcServiceWriteKey = 1234 | 691 | ; XmlRpcServiceWriteKey = 1234 |
656 | 692 | ||
693 | |||
657 | [InterestManagement] | 694 | [InterestManagement] |
658 | ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness | 695 | ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness |
659 | ;; This section controls how state updates are prioritized for each client | 696 | ;; This section controls how state updates are prioritized for each client |
@@ -661,24 +698,28 @@ | |||
661 | ;; SimpleAngularDistance, FrontBack | 698 | ;; SimpleAngularDistance, FrontBack |
662 | ; UpdatePrioritizationScheme = BestAvatarResponsiveness | 699 | ; UpdatePrioritizationScheme = BestAvatarResponsiveness |
663 | 700 | ||
701 | |||
664 | [MediaOnAPrim] | 702 | [MediaOnAPrim] |
665 | ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true | 703 | ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true |
666 | ;; Enable media on a prim facilities | 704 | ;; Enable media on a prim facilities |
667 | ; Enabled = true; | 705 | ; Enabled = true; |
668 | 706 | ||
707 | |||
669 | [Architecture] | 708 | [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 | 709 | ;# {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: | 710 | ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim, |
672 | ;; Include-Architecture = "config-include/Standalone.ini" | 711 | ;; uncomment Include-Architecture = "config-include/Standalone.ini" |
673 | ;; Include-Architecture = "config-include/StandaloneHypergrid.ini" | 712 | ;; |
674 | ;; Include-Architecture = "config-include/Grid.ini" | 713 | ;; Then you will need to copy and edit the corresponding *Common.example file in config-include/ |
675 | ;; Include-Architecture = "config-include/GridHypergrid.ini" | 714 | ;; that the referenced .ini file goes on to include. |
676 | ;; Include-Architecture = "config-include/SimianGrid.ini" | 715 | ;; |
677 | ;; Include-Architecture = "config-include/HyperSimianGrid.ini" | 716 | ;; For instance, if you chose "config-include/Standalone.ini" then you will need to copy |
717 | ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before | ||
718 | ;; editing it to set the database and backend services that OpenSim will use. | ||
719 | ;; | ||
678 | ; Include-Architecture = "config-include/Standalone.ini" | 720 | ; Include-Architecture = "config-include/Standalone.ini" |
679 | 721 | ; Include-Architecture = "config-include/StandaloneHypergrid.ini" | |
680 | ;; Then choose | 722 | ; Include-Architecture = "config-include/Grid.ini" |
681 | ;; config-include/StandaloneCommon.ini.example (if you're in standlone) OR | 723 | ; Include-Architecture = "config-include/GridHypergrid.ini" |
682 | ;; config-include/GridCommon.ini.example (if you're connected to a grid) | 724 | ; Include-Architecture = "config-include/SimianGrid.ini" |
683 | ;; Copy to your own .ini there (without .example extension) and edit it | 725 | ; Include-Architecture = "config-include/HyperSimianGrid.ini" |
684 | ;; to customize your data | ||
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 96ffb7e..f857b8d 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 | ||
@@ -287,6 +282,7 @@ | |||
287 | ;SMTP_SERVER_LOGIN=foo | 282 | ;SMTP_SERVER_LOGIN=foo |
288 | ;SMTP_SERVER_PASSWORD=bar | 283 | ;SMTP_SERVER_PASSWORD=bar |
289 | 284 | ||
285 | |||
290 | [Network] | 286 | [Network] |
291 | ConsoleUser = "Test" | 287 | ConsoleUser = "Test" |
292 | ConsolePass = "secret" | 288 | ConsolePass = "secret" |
@@ -317,6 +313,7 @@ | |||
317 | ; " (Mozilla Compatible)" to the text where there are problems with a web server | 313 | ; " (Mozilla Compatible)" to the text where there are problems with a web server |
318 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" | 314 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" |
319 | 315 | ||
316 | |||
320 | [XMLRPC] | 317 | [XMLRPC] |
321 | ; ## | 318 | ; ## |
322 | ; ## Scripting XMLRPC mapper | 319 | ; ## Scripting XMLRPC mapper |
@@ -330,6 +327,7 @@ | |||
330 | ;XmlRpcRouterModule = "XmlRpcRouterModule" | 327 | ;XmlRpcRouterModule = "XmlRpcRouterModule" |
331 | ;XmlRpcPort = 20800 | 328 | ;XmlRpcPort = 20800 |
332 | 329 | ||
330 | |||
333 | [ClientStack.LindenUDP] | 331 | [ClientStack.LindenUDP] |
334 | ; Set this to true to process incoming packets asynchronously. Networking is | 332 | ; Set this to true to process incoming packets asynchronously. Networking is |
335 | ; already separated from packet handling with a queue, so this will only | 333 | ; already separated from packet handling with a queue, so this will only |
@@ -422,6 +420,7 @@ | |||
422 | ; | 420 | ; |
423 | ;DisableFacelights = "false" | 421 | ;DisableFacelights = "false" |
424 | 422 | ||
423 | |||
425 | [Chat] | 424 | [Chat] |
426 | ; Controls whether the chat module is enabled. Default is true. | 425 | ; Controls whether the chat module is enabled. Default is true. |
427 | enabled = true; | 426 | enabled = true; |
@@ -680,6 +679,7 @@ | |||
680 | ; path to default appearance XML file that specifies the look of the default avatars | 679 | ; path to default appearance XML file that specifies the look of the default avatars |
681 | ;default_appearance = default_appearance.xml | 680 | ;default_appearance = default_appearance.xml |
682 | 681 | ||
682 | |||
683 | [RestPlugins] | 683 | [RestPlugins] |
684 | ; Change this to true to enable REST Plugins. This must be true if you wish to use | 684 | ; 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 | 685 | ; REST Region or REST Asset and Inventory Plugins |
@@ -706,11 +706,10 @@ | |||
706 | flush-on-error = true | 706 | flush-on-error = true |
707 | 707 | ||
708 | 708 | ||
709 | ; Uncomment the following for IRC bridge | 709 | ; 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 | 710 | ; also, not good error detection when it fails |
712 | ;[IRC] | 711 | [IRC] |
713 | ;enabled = true ; you need to set this otherwise it won't connect | 712 | enabled = false; you need to set this to true otherwise it won't connect |
714 | ;server = name.of.irc.server.on.the.net | 713 | ;server = name.of.irc.server.on.the.net |
715 | ;; user password - only use this if the server requires one | 714 | ;; user password - only use this if the server requires one |
716 | ;password = mypass | 715 | ;password = mypass |
@@ -767,14 +766,14 @@ | |||
767 | ;exclude_list=User 1,User 2,User 3 | 766 | ;exclude_list=User 1,User 2,User 3 |
768 | 767 | ||
769 | 768 | ||
770 | ;[CMS] | 769 | [CMS] |
771 | ;enabled = true | 770 | enabled = false |
772 | ;channel = 345 | 771 | ;channel = 345 |
773 | 772 | ||
774 | 773 | ||
775 | ; Uncomment the following to control the progression of daytime | 774 | ; The following settings control the progression of daytime |
776 | ; in the Sim. The defaults are what is shown below | 775 | ; in the Sim. The defaults are the same as the commented out settings |
777 | ;[Sun] | 776 | [Sun] |
778 | ; number of wall clock hours for an opensim day. 24.0 would mean realtime | 777 | ; number of wall clock hours for an opensim day. 24.0 would mean realtime |
779 | ;day_length = 4 | 778 | ;day_length = 4 |
780 | ; Year length in days | 779 | ; Year length in days |
@@ -821,12 +820,13 @@ | |||
821 | ; default is 1000 | 820 | ; default is 1000 |
822 | cloud_update_rate = 1000 | 821 | cloud_update_rate = 1000 |
823 | 822 | ||
824 | [LightShare] | ||
825 | 823 | ||
824 | [LightShare] | ||
826 | ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer. | 825 | ; 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. | 826 | ; It has no ill effect on viewers which do not support server-side windlight settings. |
828 | ; Currently we only have support for MySQL databases. | 827 | ; Currently we only have support for MySQL databases. |
829 | enable_windlight = false; | 828 | enable_windlight = false |
829 | |||
830 | 830 | ||
831 | [Trees] | 831 | [Trees] |
832 | ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying | 832 | ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying |
@@ -838,7 +838,6 @@ | |||
838 | 838 | ||
839 | 839 | ||
840 | [VectorRender] | 840 | [VectorRender] |
841 | |||
842 | ; the font to use for rendering text (default: Arial) | 841 | ; the font to use for rendering text (default: Arial) |
843 | ; font_name = "Arial" | 842 | ; font_name = "Arial" |
844 | 843 | ||
@@ -1032,6 +1031,7 @@ | |||
1032 | ;; Path to script assemblies | 1031 | ;; Path to script assemblies |
1033 | ; ScriptEnginesPath = "ScriptEngines" | 1032 | ; ScriptEnginesPath = "ScriptEngines" |
1034 | 1033 | ||
1034 | |||
1035 | [OpenGridProtocol] | 1035 | [OpenGridProtocol] |
1036 | ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. | 1036 | ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. |
1037 | ;On/true or Off/false | 1037 | ;On/true or Off/false |
@@ -1240,11 +1240,11 @@ | |||
1240 | ChildReprioritizationDistance = 20.0 | 1240 | ChildReprioritizationDistance = 20.0 |
1241 | 1241 | ||
1242 | 1242 | ||
1243 | [WebStats] | ||
1244 | ; View region statistics via a web page | 1243 | ; View region statistics via a web page |
1245 | ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page | 1244 | ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page |
1246 | ; Use a web browser and type in the "Login URI" + "/SStats/" | 1245 | ; Use a web browser and type in the "Login URI" + "/SStats/" |
1247 | ; For example- http://127.0.0.1:9000/SStats/ | 1246 | ; For example- http://127.0.0.1:9000/SStats/ |
1247 | [WebStats] | ||
1248 | ; enabled=false | 1248 | ; enabled=false |
1249 | 1249 | ||
1250 | 1250 | ||
diff --git a/bin/System.Data.SQLite.dll b/bin/System.Data.SQLite.dll deleted file mode 100644 index 66f38e7..0000000 --- a/bin/System.Data.SQLite.dll +++ /dev/null | |||
Binary files differ | |||
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 4dc0e53..bc8bc0f 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -6,11 +6,6 @@ | |||
6 | ; SQLite | 6 | ; SQLite |
7 | Include-Storage = "config-include/storage/SQLiteStandalone.ini"; | 7 | Include-Storage = "config-include/storage/SQLiteStandalone.ini"; |
8 | 8 | ||
9 | ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older | ||
10 | ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite) | ||
11 | ; for more details | ||
12 | ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; | ||
13 | |||
14 | ; MySql | 9 | ; MySql |
15 | ; Uncomment these lines if you want to use mysql storage | 10 | ; Uncomment these lines if you want to use mysql storage |
16 | ; Change the connection string to your db details | 11 | ; Change the connection string to your db details |
@@ -45,6 +40,12 @@ | |||
45 | ;; Directory for map tile images of linked regions | 40 | ;; Directory for map tile images of linked regions |
46 | ; MapTileDirectory = "./maptiles" | 41 | ; MapTileDirectory = "./maptiles" |
47 | 42 | ||
43 | ; === HG ONLY === | ||
44 | ;; change this to the address of your Gatekeeper service | ||
45 | ;; (usually bundled with the rest of the services in one | ||
46 | ;; Robust server in port 8002, but not always) | ||
47 | Gatekeeper="http://mygridserver.com:8002" | ||
48 | |||
48 | [AvatarService] | 49 | [AvatarService] |
49 | ; | 50 | ; |
50 | ; change this to your grid-wide grid server | 51 | ; change this to your grid-wide grid server |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 816e9a6..d6f15bb 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -8,11 +8,6 @@ | |||
8 | ; SQLite | 8 | ; SQLite |
9 | Include-Storage = "config-include/storage/SQLiteStandalone.ini"; | 9 | Include-Storage = "config-include/storage/SQLiteStandalone.ini"; |
10 | 10 | ||
11 | ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older | ||
12 | ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite) | ||
13 | ; for more details | ||
14 | ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; | ||
15 | |||
16 | ; MySql | 11 | ; MySql |
17 | ; Uncomment these lines if you want to use mysql storage | 12 | ; Uncomment these lines if you want to use mysql storage |
18 | ; Change the connection string to your db details | 13 | ; Change the connection string to your db details |
@@ -78,6 +73,11 @@ | |||
78 | ;; For example: | 73 | ;; For example: |
79 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 74 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
80 | 75 | ||
76 | ; === HG ONLY === | ||
77 | ;; change this to the address of your simulator | ||
78 | Gatekeeper="http://127.0.0.1:9000" | ||
79 | |||
80 | |||
81 | [LibraryModule] | 81 | [LibraryModule] |
82 | ; Set this if you want to change the name of the OpenSim Library | 82 | ; Set this if you want to change the name of the OpenSim Library |
83 | ;LibraryName = "My World's Library" | 83 | ;LibraryName = "My World's Library" |
diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini deleted file mode 100644 index ffe9a70..0000000 --- a/bin/config-include/storage/SQLiteLegacyStandalone.ini +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | ; These are the initialization settings for running OpenSim Standalone with an SQLite database | ||
2 | |||
3 | [DatabaseService] | ||
4 | StorageProvider = "OpenSim.Data.SQLiteLegacy.dll" | ||
5 | ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True" | ||
6 | |||
7 | [AssetService] | ||
8 | ConnectionString = "URI=file:Asset.db,version=3" | ||
9 | |||
10 | [AvatarService] | ||
11 | ConnectionString = "URI=file:avatars.db,version=3" | ||
12 | |||
13 | [AuthenticationService] | ||
14 | ConnectionString = "URI=file:auth.db,version=3" | ||
15 | |||
16 | [UserAccountService] | ||
17 | ConnectionString = "URI=file:userprofiles.db,version=3" | ||
18 | |||
19 | [FriendsService] | ||
20 | ConnectionString = "URI=file:friends.db,version=3" | ||
diff --git a/bin/libode.dylib b/bin/libode.dylib index e81f9e4..958d202 100644 --- a/bin/libode.dylib +++ b/bin/libode.dylib | |||
Binary files differ | |||
diff --git a/bin/libsqlite3.dylib b/bin/libsqlite3.dylib new file mode 100755 index 0000000..94dcca8 --- /dev/null +++ b/bin/libsqlite3.dylib | |||
Binary files differ | |||
diff --git a/bin/libsqlite3.txt b/bin/libsqlite3.txt new file mode 100644 index 0000000..8ef66bd --- /dev/null +++ b/bin/libsqlite3.txt | |||
@@ -0,0 +1 @@ | |||
libsqlite version: 3.7.5 | |||
diff --git a/bin/libsqlite3_32.so b/bin/libsqlite3_32.so new file mode 100755 index 0000000..171ffcd --- /dev/null +++ b/bin/libsqlite3_32.so | |||
Binary files differ | |||
diff --git a/bin/libsqlite3_64.so b/bin/libsqlite3_64.so new file mode 100755 index 0000000..2646a9c --- /dev/null +++ b/bin/libsqlite3_64.so | |||
Binary files differ | |||
diff --git a/bin/sqlite-3.6.21.so b/bin/sqlite-3.6.21.so deleted file mode 100644 index 2a8f38b..0000000 --- a/bin/sqlite-3.6.21.so +++ /dev/null | |||
Binary files differ | |||