aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-21 15:50:03 -0800
committeropensim mirror account2010-11-21 15:50:03 -0800
commita145a294cf0e7e9cc4197817feb680c9b5b342e4 (patch)
treea6a00dfbac4a1e75e4c6bf4cdcbfe6e048886bd8
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentRemove username and password from the publicly accessible FS config (diff)
downloadopensim-SC_OLD-a145a294cf0e7e9cc4197817feb680c9b5b342e4.zip
opensim-SC_OLD-a145a294cf0e7e9cc4197817feb680c9b5b342e4.tar.gz
opensim-SC_OLD-a145a294cf0e7e9cc4197817feb680c9b5b342e4.tar.bz2
opensim-SC_OLD-a145a294cf0e7e9cc4197817feb680c9b5b342e4.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/Services/FreeswitchService/FreeswitchService.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 21518f3..fe6f5cd 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Services.FreeswitchService
388 388
389 public string GetJsonConfig() 389 public string GetJsonConfig()
390 { 390 {
391 OSDMap map = new OSDMap(11); 391 OSDMap map = new OSDMap(9);
392 392
393 map.Add("Realm", m_freeSwitchRealm); 393 map.Add("Realm", m_freeSwitchRealm);
394 map.Add("SIPProxy", m_freeSwitchSIPProxy); 394 map.Add("SIPProxy", m_freeSwitchSIPProxy);
@@ -398,8 +398,6 @@ namespace OpenSim.Services.FreeswitchService
398 map.Add("DefaultWellKnownIP", m_freeSwitchDefaultWellKnownIP); 398 map.Add("DefaultWellKnownIP", m_freeSwitchDefaultWellKnownIP);
399 map.Add("DefaultTimeout", m_freeSwitchDefaultTimeout); 399 map.Add("DefaultTimeout", m_freeSwitchDefaultTimeout);
400 map.Add("Context", m_freeSwitchContext); 400 map.Add("Context", m_freeSwitchContext);
401 map.Add("ServerUser", m_freeSwitchServerUser);
402 map.Add("ServerPass", m_freeSwitchServerPass);
403 map.Add("APIPrefix", m_freeSwitchAPIPrefix); 401 map.Add("APIPrefix", m_freeSwitchAPIPrefix);
404 402
405 return OSDParser.SerializeJsonString(map); 403 return OSDParser.SerializeJsonString(map);