diff options
author | Mic Bowman | 2011-04-21 08:23:01 -0700 |
---|---|---|
committer | Mic Bowman | 2011-04-21 08:23:01 -0700 |
commit | 371576d1dd9fb49f9e366b0fac44ab73381b3baa (patch) | |
tree | af61ce33dc45340ea1f99066eee64950014994ee /bin/OpenSim.ini.example | |
parent | Added ability to remove unacked packet from UnackedPacketCollection without a... (diff) | |
parent | fix meshing failure on sculpt maps smaller than 64x64 (diff) | |
download | opensim-SC-371576d1dd9fb49f9e366b0fac44ab73381b3baa.zip opensim-SC-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.gz opensim-SC-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.bz2 opensim-SC-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.xz |
Merge branch 'master' into queuetest
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r-- | bin/OpenSim.ini.example | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index c05c3de..fbaa590 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -621,10 +621,11 @@ | |||
621 | 621 | ||
622 | ;; 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 |
623 | ;; 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 | ||
624 | ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService | 625 | ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService |
625 | ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector | 626 | ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector |
626 | 627 | ||
627 | ;; If using a remote module, specify the server URL | 628 | ;; If using a remote connector, specify the server URL |
628 | ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi | 629 | ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi |
629 | 630 | ||
630 | 631 | ||
@@ -632,20 +633,37 @@ | |||
632 | ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! | 633 | ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! |
633 | ;; !!!!!!STANDALONE ONLY!!!!!! | 634 | ;; !!!!!!STANDALONE ONLY!!!!!! |
634 | ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! | 635 | ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! |
635 | ;; 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 |
636 | ;ServerAddress = 85.25.142.92 | 637 | ;; This has to be set for the FreeSWITCH service to work |
638 | ;ServerAddress = 127.0.0.1 | ||
637 | 639 | ||
638 | ;; All other options are - well - optional | 640 | ;; The following configuration parameters are optional |
639 | ; Realm = "127.0.0.1" | 641 | |
640 | ; SIPProxy = "127.0.0.1:5060" | 642 | ;; By default, this is the same as the ServerAddress |
641 | ; EchoServer = "127.0.0.1" | 643 | ; Realm = 127.0.0.1 |
642 | ; EchoPort = 50505 | 644 | |
643 | ; 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 | ||
644 | ; DefaultTimeout = 5000 | 649 | ; DefaultTimeout = 5000 |
645 | ; Context = "default" | ||
646 | ; UserName = "freeswitch" | ||
647 | ; Password = "password" | ||
648 | 650 | ||
651 | ;; The dial plan context. Default is "default" | ||
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 | ||
649 | 667 | ||
650 | [Groups] | 668 | [Groups] |
651 | ;# {Enabled} {} {Enable groups?} {true false} false | 669 | ;# {Enabled} {} {Enable groups?} {true false} false |