aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2011-04-21 23:06:01 +0100
committerMelanie2011-04-21 23:06:01 +0100
commit0c68fbdb1aa746d1f18242f921bd2605271c06db (patch)
treec5a35a5723f4c73821c20773d6bc2897b92dcce8 /OpenSim/Services
parentAdd fix a minor bug (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.zip
opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.gz
opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.bz2
opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/FreeswitchService/FreeswitchService.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 1ec89da..c3f1056 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Services.FreeswitchService
56 56
57 foreach (DictionaryEntry item in request) 57 foreach (DictionaryEntry item in request)
58 { 58 {
59 m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value); 59// m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value);
60 } 60 }
61 61
62 string requestcontext = (string) request["Hunt-Context"]; 62 string requestcontext = (string) request["Hunt-Context"];
@@ -146,10 +146,8 @@ namespace OpenSim.Services.FreeswitchService
146 //domain=9.20.151.43 146 //domain=9.20.151.43
147 //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup 147 //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
148 148
149 foreach (DictionaryEntry item in request) 149// foreach (DictionaryEntry item in request)
150 { 150// m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
151 m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
152 }
153 151
154 string eventCallingFunction = (string) request["Event-Calling-Function"]; 152 string eventCallingFunction = (string) request["Event-Calling-Function"];
155 if (eventCallingFunction == null) 153 if (eventCallingFunction == null)