aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDr Scofield2009-04-22 09:42:44 +0000
committerDr Scofield2009-04-22 09:42:44 +0000
commit458f7eb9b38609d02980afe5a6ee88d19c7dd7f8 (patch)
treeb8d2b6c140ca373ca5604f7087541f74185ac77c /OpenSim/Region
parent* update example to reflect optional Well known hostname. (diff)
downloadopensim-SC_OLD-458f7eb9b38609d02980afe5a6ee88d19c7dd7f8.zip
opensim-SC_OLD-458f7eb9b38609d02980afe5a6ee88d19c7dd7f8.tar.gz
opensim-SC_OLD-458f7eb9b38609d02980afe5a6ee88d19c7dd7f8.tar.bz2
opensim-SC_OLD-458f7eb9b38609d02980afe5a6ee88d19c7dd7f8.tar.xz
cleaning up, fixing warnings
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs63
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs42
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
6 files changed, 53 insertions, 70 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index a93a3e5..0727da5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
260 m_sentinfo = true; 260 m_sentinfo = true;
261 m_packetNumber++; 261 m_packetNumber++;
262 } 262 }
263 bool ignoreStop = false; 263 // bool ignoreStop = false;
264 if (m_packetNumber < 2) 264 if (m_packetNumber < 2)
265 { 265 {
266 m_packetNumber = 2; 266 m_packetNumber = 2;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
index d8fce67..039cc2f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
50 50
51 response["content_type"] = "text/xml"; 51 response["content_type"] = "text/xml";
52 response["keepalive"] = false; 52 response["keepalive"] = false;
53 response["int_response_code"]=200; 53 response["int_response_code"] = 200;
54 response["str_response_string"] = @"<?xml version=""1.0"" encoding=""utf-8""?> 54 response["str_response_string"] = @"<?xml version=""1.0"" encoding=""utf-8""?>
55 <document type=""freeswitch/xml""> 55 <document type=""freeswitch/xml"">
56 <section name=""dialplan""> 56 <section name=""dialplan"">
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
index 24f114d..fd384e4 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
65 65
66 foreach (DictionaryEntry item in request) 66 foreach (DictionaryEntry item in request)
67 { 67 {
68 m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value); 68 m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}", item.Key, item.Value);
69 } 69 }
70 70
71 string eventCallingFunction = (string) request["Event-Calling-Function"]; 71 string eventCallingFunction = (string) request["Event-Calling-Function"];
@@ -79,44 +79,44 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
79 eventCallingFunction = "sofia_reg_parse_auth"; 79 eventCallingFunction = "sofia_reg_parse_auth";
80 } 80 }
81 81
82 if (eventCallingFunction=="sofia_reg_parse_auth") 82 if (eventCallingFunction == "sofia_reg_parse_auth")
83 { 83 {
84 string sipAuthMethod = (string)request["sip_auth_method"]; 84 string sipAuthMethod = (string)request["sip_auth_method"];
85 85
86 if (sipAuthMethod=="REGISTER") 86 if (sipAuthMethod == "REGISTER")
87 { 87 {
88 response = HandleRegister(request); 88 response = HandleRegister(request);
89 } 89 }
90 else if (sipAuthMethod=="INVITE") 90 else if (sipAuthMethod == "INVITE")
91 { 91 {
92 response = HandleInvite(request); 92 response = HandleInvite(request);
93 } 93 }
94 else 94 else
95 { 95 {
96 m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod); 96 m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
97 response["int_response_code"]=404; 97 response["int_response_code"] = 404;
98 } 98 }
99 } 99 }
100 else if (eventCallingFunction=="switch_xml_locate_user") 100 else if (eventCallingFunction == "switch_xml_locate_user")
101 { 101 {
102 response = HandleLocateUser(request); 102 response = HandleLocateUser(request);
103 } 103 }
104 else if (eventCallingFunction=="user_data_function") // gets called when an avatar to avatar call is made 104 else if (eventCallingFunction == "user_data_function") // gets called when an avatar to avatar call is made
105 { 105 {
106 response = HandleLocateUser(request); 106 response = HandleLocateUser(request);
107 } 107 }
108 else if (eventCallingFunction=="user_outgoing_channel") 108 else if (eventCallingFunction == "user_outgoing_channel")
109 { 109 {
110 response = HandleRegister(request); 110 response = HandleRegister(request);
111 } 111 }
112 else if (eventCallingFunction=="config_sofia") // happens once on freeswitch startup 112 else if (eventCallingFunction == "config_sofia") // happens once on freeswitch startup
113 { 113 {
114 response = HandleConfigSofia(request); 114 response = HandleConfigSofia(request);
115 } 115 }
116 else if (eventCallingFunction=="switch_load_network_lists") 116 else if (eventCallingFunction == "switch_load_network_lists")
117 { 117 {
118 //response = HandleLoadNetworkLists(request); 118 //response = HandleLoadNetworkLists(request);
119 response["int_response_code"]=404; 119 response["int_response_code"] = 404;
120 response["keepalive"] = false; 120 response["keepalive"] = false;
121 response["content_type"] = "text/xml"; 121 response["content_type"] = "text/xml";
122 response["str_response_string"] = ""; 122 response["str_response_string"] = "";
@@ -124,14 +124,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
124 else 124 else
125 { 125 {
126 m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown Event-Calling-Function {0}",eventCallingFunction); 126 m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown Event-Calling-Function {0}",eventCallingFunction);
127 response["int_response_code"]=404; 127 response["int_response_code"] = 404;
128 response["keepalive"] = false; 128 response["keepalive"] = false;
129 response["content_type"] = "text/xml"; 129 response["content_type"] = "text/xml";
130 response["str_response_string"] = ""; 130 response["str_response_string"] = "";
131 } 131 }
132
133
134
135 return response; 132 return response;
136 } 133 }
137 134
@@ -147,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
147 Hashtable response = new Hashtable(); 144 Hashtable response = new Hashtable();
148 response["content_type"] = "text/xml"; 145 response["content_type"] = "text/xml";
149 response["keepalive"] = false; 146 response["keepalive"] = false;
150 response["int_response_code"]=200; 147 response["int_response_code"] = 200;
151 response["str_response_string"] = String.Format( 148 response["str_response_string"] = String.Format(
152 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + 149 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
153 "<document type=\"freeswitch/xml\">\r\n" + 150 "<document type=\"freeswitch/xml\">\r\n" +
@@ -165,11 +162,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
165 "</user>\r\n" + 162 "</user>\r\n" +
166 "</domain>\r\n" + 163 "</domain>\r\n" +
167 "</section>\r\n" + 164 "</section>\r\n" +
168 "</document>\r\n" 165 "</document>\r\n",
169 , domain , user, password); 166 domain , user, password);
170 167
171 return response; 168 return response;
172
173 } 169 }
174 170
175 private Hashtable HandleInvite(Hashtable request) 171 private Hashtable HandleInvite(Hashtable request)
@@ -185,7 +181,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
185 Hashtable response = new Hashtable(); 181 Hashtable response = new Hashtable();
186 response["content_type"] = "text/xml"; 182 response["content_type"] = "text/xml";
187 response["keepalive"] = false; 183 response["keepalive"] = false;
188 response["int_response_code"]=200; 184 response["int_response_code"] = 200;
189 response["str_response_string"] = String.Format( 185 response["str_response_string"] = String.Format(
190 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + 186 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
191 "<document type=\"freeswitch/xml\">\r\n" + 187 "<document type=\"freeswitch/xml\">\r\n" +
@@ -213,8 +209,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
213 "</user>\r\n" + 209 "</user>\r\n" +
214 "</domain>\r\n" + 210 "</domain>\r\n" +
215 "</section>\r\n" + 211 "</section>\r\n" +
216 "</document>\r\n" 212 "</document>\r\n",
217 , domain , user, password,sipRequestUser); 213 domain , user, password,sipRequestUser);
218 214
219 return response; 215 return response;
220 } 216 }
@@ -231,7 +227,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
231 Hashtable response = new Hashtable(); 227 Hashtable response = new Hashtable();
232 response["content_type"] = "text/xml"; 228 response["content_type"] = "text/xml";
233 response["keepalive"] = false; 229 response["keepalive"] = false;
234 response["int_response_code"]=200; 230 response["int_response_code"] = 200;
235 response["str_response_string"] = String.Format( 231 response["str_response_string"] = String.Format(
236 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + 232 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
237 "<document type=\"freeswitch/xml\">\r\n" + 233 "<document type=\"freeswitch/xml\">\r\n" +
@@ -248,10 +244,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
248 "</user>\r\n" + 244 "</user>\r\n" +
249 "</domain>\r\n" + 245 "</domain>\r\n" +
250 "</section>\r\n" + 246 "</section>\r\n" +
251 "</document>\r\n" 247 "</document>\r\n",
252 , domain , user); 248 domain , user);
253
254
255 249
256 return response; 250 return response;
257 } 251 }
@@ -266,7 +260,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
266 Hashtable response = new Hashtable(); 260 Hashtable response = new Hashtable();
267 response["content_type"] = "text/xml"; 261 response["content_type"] = "text/xml";
268 response["keepalive"] = false; 262 response["keepalive"] = false;
269 response["int_response_code"]=200; 263 response["int_response_code"] = 200;
270 response["str_response_string"] = String.Format( 264 response["str_response_string"] = String.Format(
271 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + 265 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
272 "<document type=\"freeswitch/xml\">\r\n" + 266 "<document type=\"freeswitch/xml\">\r\n" +
@@ -303,9 +297,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
303 "</variables>\r\n"+ 297 "</variables>\r\n"+
304 "</domain>\r\n" + 298 "</domain>\r\n" +
305 "</section>\r\n" + 299 "</section>\r\n" +
306 "</document>\r\n" 300 "</document>\r\n",
307 , domain); 301 domain);
308
309 302
310 return response; 303 return response;
311 } 304 }
@@ -320,7 +313,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
320 Hashtable response = new Hashtable(); 313 Hashtable response = new Hashtable();
321 response["content_type"] = "text/xml"; 314 response["content_type"] = "text/xml";
322 response["keepalive"] = false; 315 response["keepalive"] = false;
323 response["int_response_code"]=200; 316 response["int_response_code"] = 200;
324 response["str_response_string"] = String.Format( 317 response["str_response_string"] = String.Format(
325 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + 318 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
326 "<document type=\"freeswitch/xml\">\r\n" + 319 "<document type=\"freeswitch/xml\">\r\n" +
@@ -335,13 +328,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
335 "</variables>\r\n"+ 328 "</variables>\r\n"+
336 "</domain>\r\n" + 329 "</domain>\r\n" +
337 "</section>\r\n" + 330 "</section>\r\n" +
338 "</document>\r\n" 331 "</document>\r\n",
339 , domain); 332 domain);
340 333
341 334
342 return response; 335 return response;
343 } 336 }
344
345 } 337 }
346
347} 338}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 6fb2c53..358f1cd 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -54,7 +54,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
54 // Infrastructure 54 // Infrastructure
55 private static readonly ILog m_log = 55 private static readonly ILog m_log =
56 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 56 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
57 private static readonly bool DUMP = true;
58 57
59 // Capability string prefixes 58 // Capability string prefixes
60 private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; 59 private static readonly string m_parcelVoiceInfoRequestPath = "0007/";
@@ -87,9 +86,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
87 private static int m_freeSwitchEchoPort; 86 private static int m_freeSwitchEchoPort;
88 private static string m_freeSwitchDefaultWellKnownIP; 87 private static string m_freeSwitchDefaultWellKnownIP;
89 private static int m_freeSwitchDefaultTimeout; 88 private static int m_freeSwitchDefaultTimeout;
90 private static int m_freeSwitchSubscribeRetry; 89 // private static int m_freeSwitchSubscribeRetry;
91 private static string m_freeSwitchUrlResetPassword; 90 private static string m_freeSwitchUrlResetPassword;
92 private static IPEndPoint m_FreeSwitchServiceIP; 91 // private static IPEndPoint m_FreeSwitchServiceIP;
93 private int m_freeSwitchServicePort; 92 private int m_freeSwitchServicePort;
94 private string m_openSimWellKnownHTTPAddress; 93 private string m_openSimWellKnownHTTPAddress;
95 94
@@ -132,7 +131,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
132 string serviceIP = m_config.GetString("freeswitch_service_server", String.Empty); 131 string serviceIP = m_config.GetString("freeswitch_service_server", String.Empty);
133 int servicePort = m_config.GetInt("freeswitch_service_port", 80); 132 int servicePort = m_config.GetInt("freeswitch_service_port", 80);
134 IPAddress serviceIPAddress = IPAddress.Parse(serviceIP); 133 IPAddress serviceIPAddress = IPAddress.Parse(serviceIP);
135 m_FreeSwitchServiceIP = new IPEndPoint(serviceIPAddress, servicePort); 134 // m_FreeSwitchServiceIP = new IPEndPoint(serviceIPAddress, servicePort);
136 m_freeSwitchServicePort = servicePort; 135 m_freeSwitchServicePort = servicePort;
137 m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty); 136 m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty);
138 m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm); 137 m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm);
@@ -143,12 +142,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
143 m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm); 142 m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm);
144 m_openSimWellKnownHTTPAddress = m_config.GetString("opensim_well_known_http_address", serviceIPAddress.ToString()); 143 m_openSimWellKnownHTTPAddress = m_config.GetString("opensim_well_known_http_address", serviceIPAddress.ToString());
145 m_freeSwitchDefaultTimeout = m_config.GetInt("freeswitch_default_timeout", 5000); 144 m_freeSwitchDefaultTimeout = m_config.GetInt("freeswitch_default_timeout", 5000);
146 m_freeSwitchSubscribeRetry = m_config.GetInt("freeswitch_subscribe_retry", 120); 145 // m_freeSwitchSubscribeRetry = m_config.GetInt("freeswitch_subscribe_retry", 120);
147 m_freeSwitchUrlResetPassword = m_config.GetString("freeswitch_password_reset_url", String.Empty); 146 m_freeSwitchUrlResetPassword = m_config.GetString("freeswitch_password_reset_url", String.Empty);
148 147
149
150
151
152 if (String.IsNullOrEmpty(m_freeSwitchServerUser) || 148 if (String.IsNullOrEmpty(m_freeSwitchServerUser) ||
153 String.IsNullOrEmpty(m_freeSwitchServerPass) || 149 String.IsNullOrEmpty(m_freeSwitchServerPass) ||
154 String.IsNullOrEmpty(m_freeSwitchRealm) || 150 String.IsNullOrEmpty(m_freeSwitchRealm) ||
@@ -163,12 +159,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
163 // - prelogin: viv_get_prelogin.php 159 // - prelogin: viv_get_prelogin.php
164 // - signin: viv_signin.php 160 // - signin: viv_signin.php
165 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), 161 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix),
166 FreeSwitchSLVoiceGetPreloginHTTPHandler); 162 FreeSwitchSLVoiceGetPreloginHTTPHandler);
167 163
168 // RestStreamHandler h = new RestStreamHandler("GET", String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler); 164 // RestStreamHandler h = new
165 // RestStreamHandler("GET",
166 // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler);
169 // scene.CommsManager.HttpServer.AddStreamHandler(h); 167 // scene.CommsManager.HttpServer.AddStreamHandler(h);
170
171
172 168
173 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix), 169 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix),
174 FreeSwitchSLVoiceSigninHTTPHandler); 170 FreeSwitchSLVoiceSigninHTTPHandler);
@@ -307,15 +303,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
307 // XXX: we need to cache the voice credentials, as 303 // XXX: we need to cache the voice credentials, as
308 // FreeSwitch is later going to come and ask us for 304 // FreeSwitch is later going to come and ask us for
309 // those 305 // those
310
311 agentname = agentname.Replace('+', '-').Replace('/', '_'); 306 agentname = agentname.Replace('+', '-').Replace('/', '_');
312 307
313 // LLSDVoiceAccountResponse voiceAccountResponse = 308 // LLSDVoiceAccountResponse voiceAccountResponse =
314 // new LLSDVoiceAccountResponse(agentname, password, m_freeSwitchRealm, "http://etsvc02.hursley.ibm.com/api"); 309 // new LLSDVoiceAccountResponse(agentname, password, m_freeSwitchRealm, "http://etsvc02.hursley.ibm.com/api");
315 LLSDVoiceAccountResponse voiceAccountResponse = 310 LLSDVoiceAccountResponse voiceAccountResponse =
316 new LLSDVoiceAccountResponse(agentname, password, m_freeSwitchRealm, 311 new LLSDVoiceAccountResponse(agentname, password, m_freeSwitchRealm,
317 String.Format("http://{0}:{1}{2}/", m_openSimWellKnownHTTPAddress, m_freeSwitchServicePort, 312 String.Format("http://{0}:{1}{2}/", m_openSimWellKnownHTTPAddress,
318 m_freeSwitchAPIPrefix)); 313 m_freeSwitchServicePort, m_freeSwitchAPIPrefix));
319 314
320 string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); 315 string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse);
321 316
@@ -346,7 +341,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
346 UUID agentID, Caps caps) 341 UUID agentID, Caps caps)
347 { 342 {
348 ScenePresence avatar = scene.GetScenePresence(agentID); 343 ScenePresence avatar = scene.GetScenePresence(agentID);
349 string avatarName = avatar.Name; 344 string avatarName = avatar.Name;
350 345
351 // - check whether we have a region channel in our cache 346 // - check whether we have a region channel in our cache
352 // - if not: 347 // - if not:
@@ -460,11 +455,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
460 "<UrlPrivacyNotice>{8}</UrlPrivacyNotice>\r\n"+ 455 "<UrlPrivacyNotice>{8}</UrlPrivacyNotice>\r\n"+
461 "<UrlEulaNotice/>\r\n"+ 456 "<UrlEulaNotice/>\r\n"+
462 "<App.NoBottomLogo>false</App.NoBottomLogo>\r\n"+ 457 "<App.NoBottomLogo>false</App.NoBottomLogo>\r\n"+
463 "</VCConfiguration>" 458 "</VCConfiguration>",
464 , 459 m_freeSwitchRealm, m_freeSwitchSIPProxy, m_freeSwitchAttemptUseSTUN,
465 m_freeSwitchRealm,m_freeSwitchSIPProxy,m_freeSwitchAttemptUseSTUN, 460 m_freeSwitchSTUNServer, m_freeSwitchEchoServer, m_freeSwitchEchoPort,
466 m_freeSwitchSTUNServer,m_freeSwitchEchoServer,m_freeSwitchEchoPort, 461 m_freeSwitchDefaultWellKnownIP, m_freeSwitchDefaultTimeout,
467 m_freeSwitchDefaultWellKnownIP,m_freeSwitchDefaultTimeout,m_freeSwitchUrlResetPassword,""); 462 m_freeSwitchUrlResetPassword, "");
468 463
469 response["int_response_code"] = 200; 464 response["int_response_code"] = 200;
470 465
@@ -531,12 +526,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
531 if (s.Trim() != "") 526 if (s.Trim() != "")
532 { 527 {
533 string [] nvp = s.Split(new Char [] {'='}); 528 string [] nvp = s.Split(new Char [] {'='});
534 bodyParams.Add(HttpUtility.UrlDecode(nvp[0]),HttpUtility.UrlDecode(nvp[1])); 529 bodyParams.Add(HttpUtility.UrlDecode(nvp[0]), HttpUtility.UrlDecode(nvp[1]));
535 } 530 }
536 } 531 }
537 532
538 return bodyParams; 533 return bodyParams;
539
540 } 534 }
541 535
542 private string ChannelUri(Scene scene, LandData land) 536 private string ChannelUri(Scene scene, LandData land)
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
index 3a728da..ada6cfd 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
218 public GroupRecord GetGroupRecord(UUID GroupID, string GroupName) 218 public GroupRecord GetGroupRecord(UUID GroupID, string GroupName)
219 { 219 {
220 Hashtable param = new Hashtable(); 220 Hashtable param = new Hashtable();
221 if ((GroupID != null) && (GroupID != UUID.Zero)) 221 if (GroupID != UUID.Zero)
222 { 222 {
223 param["GroupID"] = GroupID.ToString(); 223 param["GroupID"] = GroupID.ToString();
224 } 224 }
@@ -793,7 +793,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
793 { 793 {
794 m_log.ErrorFormat("[GROUPDATA] Key: {0}", key); 794 m_log.ErrorFormat("[GROUPDATA] Key: {0}", key);
795 795
796 object o = respData[key]; 796 // object o = respData[key];
797 797
798 string[] lines = respData[key].ToString().Split(new char[] { '\n' }); 798 string[] lines = respData[key].ToString().Split(new char[] { '\n' });
799 foreach (string line in lines) 799 foreach (string line in lines)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index deb4dae..faacc76 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9194,9 +9194,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9194 return UUID.Zero.ToString(); 9194 return UUID.Zero.ToString();
9195 } 9195 }
9196 9196
9197 UUID tid = tid = AsyncCommands. 9197 // was: UUID tid = tid = AsyncCommands.
9198 DataserverPlugin.RegisterRequest(m_localID, 9198 UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, assetID.ToString());
9199 m_itemID, assetID.ToString());
9200 9199
9201 if (NotecardCache.IsCached(assetID)) 9200 if (NotecardCache.IsCached(assetID))
9202 { 9201 {
@@ -9257,9 +9256,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9257 return UUID.Zero.ToString(); 9256 return UUID.Zero.ToString();
9258 } 9257 }
9259 9258
9260 UUID tid = tid = AsyncCommands. 9259 // was: UUID tid = tid = AsyncCommands.
9261 DataserverPlugin.RegisterRequest(m_localID, 9260 UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, assetID.ToString());
9262 m_itemID, assetID.ToString());
9263 9261
9264 if (NotecardCache.IsCached(assetID)) 9262 if (NotecardCache.IsCached(assetID))
9265 { 9263 {