From b000d4f67fd31251dfdcabbada371a5f57a80b0a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 2 Jun 2011 21:37:17 +0100
Subject: minor: add ini.example doc to hint that the server address in
 [FreeswitchService] must be reachable by viewers

---
 bin/OpenSim.ini.example | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/OpenSim.ini.example')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c5df0db..55cf89a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -649,6 +649,7 @@
     ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
     ;; The IP address of your FreeSWITCH server.  The common case is for this to be the same as the server running the OpenSim standalone
     ;; This has to be set for the FreeSWITCH service to work
+    ;; This address must be reachable by viewers.
     ;ServerAddress = 127.0.0.1
 
     ;; The following configuration parameters are optional
-- 
cgit v1.1


From dfa4442319397abd91e1ffbf61b02fb63b8f46d2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 2 Jun 2011 22:43:44 +0100
Subject: Move the "!!!Standalone Only!!!" [FreeswitchService] section from
 OpenSim.ini.example to config/StandaloneCommon.ini.example where it belongs.

---
 bin/OpenSim.ini.example | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

(limited to 'bin/OpenSim.ini.example')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 55cf89a..813c5b8 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -635,51 +635,13 @@
 
     ;; You need to load a local service for a standalone, and a remote service
     ;; for a grid region. Use one of the lines below, as appropriate
-    ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section
+    ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section in config-include/StandaloneCommon.ini
     ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService
     ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector
 
     ;; If using a remote connector, specify the server URL
     ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi
 
-
-[FreeswitchService]
-    ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
-    ;; !!!!!!STANDALONE ONLY!!!!!!
-    ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
-    ;; The IP address of your FreeSWITCH server.  The common case is for this to be the same as the server running the OpenSim standalone
-    ;; This has to be set for the FreeSWITCH service to work
-    ;; This address must be reachable by viewers.
-    ;ServerAddress = 127.0.0.1
-
-    ;; The following configuration parameters are optional
-
-    ;; By default, this is the same as the ServerAddress
-    ; Realm = 127.0.0.1
-
-    ;; By default, this is the same as the ServerAddress on port 5060
-    ; SIPProxy = 127.0.0.1:5060
-
-    ;; Default is 5000ms
-    ; DefaultTimeout = 5000
-
-    ;; The dial plan context.  Default is "default"
-    ; Context = default
-
-    ;; Currently unused
-    ; UserName = freeswitch
-
-    ;; Currently unused
-    ; Password = password
-
-    ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
-    ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
-    ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
-    ; EchoServer = 127.0.0.1
-    ; EchoPort = 50505
-    ; AttemptSTUN = false
-
 [Groups]
     ;# {Enabled} {} {Enable groups?} {true false} false
     ;; Enables the groups module
-- 
cgit v1.1