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 | |
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_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.zip opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.gz opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.bz2 opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.xz |
Merge branch 'master' into queuetest
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 42 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 2 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 42 | ||||
-rw-r--r-- | bin/Robust.ini.example | 38 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 18 |
5 files changed, 96 insertions, 46 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 |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e72e851..30ebf84 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -459,7 +459,7 @@ | |||
459 | [Mesh] | 459 | [Mesh] |
460 | ; enable / disable Collada mesh support | 460 | ; enable / disable Collada mesh support |
461 | ; default is true | 461 | ; default is true |
462 | ; ColladaMesh = true | 462 | ColladaMesh = true |
463 | 463 | ||
464 | 464 | ||
465 | [ODEPhysicsSettings] | 465 | [ODEPhysicsSettings] |
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index f12a143..ced2857 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -85,19 +85,41 @@ 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 | ||
119 | |||
120 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" | ||
121 | ;; IP of your FS server | ||
122 | ; ServerAddress = 127.0.0.1 | ||
101 | 123 | ||
102 | ; * This is the new style authentication service. Currently, only MySQL | 124 | ; * This is the new style authentication service. Currently, only MySQL |
103 | ; * is implemented. | 125 | ; * 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 |