aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-28 18:20:02 -0800
committeropensim mirror account2010-11-28 18:20:02 -0800
commit51a2cab05bc008e91e91aa2a5bc08034046f4b36 (patch)
treebcd080ba775ca67bfd6bbefddf0eef85895f5e06
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentFix the build break (diff)
downloadopensim-SC_OLD-51a2cab05bc008e91e91aa2a5bc08034046f4b36.zip
opensim-SC_OLD-51a2cab05bc008e91e91aa2a5bc08034046f4b36.tar.gz
opensim-SC_OLD-51a2cab05bc008e91e91aa2a5bc08034046f4b36.tar.bz2
opensim-SC_OLD-51a2cab05bc008e91e91aa2a5bc08034046f4b36.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 0b51bf0..e9c5453 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -364,7 +364,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
364 try 364 try
365 { 365 {
366 //m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", 366 //m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}",
367 request, path, param); 367 // request, path, param);
368 368
369 //XmlElement resp; 369 //XmlElement resp;
370 string agentname = "x" + Convert.ToBase64String(agentID.GetBytes()); 370 string agentname = "x" + Convert.ToBase64String(agentID.GetBytes());
@@ -446,7 +446,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
446 LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); 446 LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
447 447
448 //m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", 448 //m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}",
449 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); 449 // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
450 450
451 // TODO: EstateSettings don't seem to get propagated... 451 // TODO: EstateSettings don't seem to get propagated...
452 // if (!scene.RegionInfo.EstateSettings.AllowVoice) 452 // if (!scene.RegionInfo.EstateSettings.AllowVoice)
@@ -697,7 +697,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
697 } 697 }
698 698
699 //m_log.DebugFormat("[FreeSwitchVoice]: AUTH, URI: {0}, Content-Type:{1}, Body{2}", uri, contenttype, 699 //m_log.DebugFormat("[FreeSwitchVoice]: AUTH, URI: {0}, Content-Type:{1}, Body{2}", uri, contenttype,
700 requestbody); 700 // requestbody);
701 Hashtable response = new Hashtable(); 701 Hashtable response = new Hashtable();
702 response["str_response_string"] = string.Format(@"<response xsi:schemaLocation=""/xsd/signin.xsd""> 702 response["str_response_string"] = string.Format(@"<response xsi:schemaLocation=""/xsd/signin.xsd"">
703 <level0> 703 <level0>