aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-22 19:43:58 +0000
committerJustin Clarke Casey2009-04-22 19:43:58 +0000
commitc25ceb009e644579c56811faffded540658cd4dd (patch)
treea0f00bac45c3118c199e736795fc2f6ae23a5ecb /OpenSim
parentThank you kindly, TLaukkan, for a patch that: (diff)
downloadopensim-SC_OLD-c25ceb009e644579c56811faffded540658cd4dd.zip
opensim-SC_OLD-c25ceb009e644579c56811faffded540658cd4dd.tar.gz
opensim-SC_OLD-c25ceb009e644579c56811faffded540658cd4dd.tar.bz2
opensim-SC_OLD-c25ceb009e644579c56811faffded540658cd4dd.tar.xz
* minor: remove some compiler warnings
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs14
-rw-r--r--OpenSim/Client/VWoHTTP/VWoHTTPModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs62
3 files changed, 39 insertions, 39 deletions
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index badf918..bf622c6 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -12,21 +12,21 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
12{ 12{
13 class VWHClientView : IClientAPI 13 class VWHClientView : IClientAPI
14 { 14 {
15 private Scene m_scene; 15// private Scene m_scene;
16 16
17 public void ProcessInMsg(OSHttpRequest req, OSHttpResponse resp) 17 public void ProcessInMsg(OSHttpRequest req, OSHttpResponse resp)
18 { 18 {
19 string method = req.Url.AbsolutePath.Split('/')[2]; 19// string method = req.Url.AbsolutePath.Split('/')[2];
20 } 20 }
21 21
22 private void ProcessAssetRequest(OSHttpRequest req, OSHttpResponse resp) 22// private void ProcessAssetRequest(OSHttpRequest req, OSHttpResponse resp)
23 { 23// {
24 24//
25 } 25// }
26 26
27 public VWHClientView(UUID sessionID, UUID agentID, string agentName, Scene scene) 27 public VWHClientView(UUID sessionID, UUID agentID, string agentName, Scene scene)
28 { 28 {
29 m_scene = scene; 29// m_scene = scene;
30 } 30 }
31 31
32 #region Implementation of IClientAPI 32 #region Implementation of IClientAPI
diff --git a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
index f698c8c..451bf1e 100644
--- a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
+++ b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
@@ -18,7 +18,7 @@ namespace OpenSim.Client.VWoHTTP
18 18
19 private readonly List<Scene> m_scenes = new List<Scene>(); 19 private readonly List<Scene> m_scenes = new List<Scene>();
20 20
21 private Dictionary<UUID, VWHClientView> m_clients = new Dictionary<UUID, VWHClientView>(); 21 //private Dictionary<UUID, VWHClientView> m_clients = new Dictionary<UUID, VWHClientView>();
22 22
23 #region Implementation of IRegionModule 23 #region Implementation of IRegionModule
24 24
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
index fd384e4..c131a7f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
@@ -303,36 +303,36 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
303 return response; 303 return response;
304 } 304 }
305 305
306 private Hashtable HandleLoadNetworkLists(Hashtable request) 306// private Hashtable HandleLoadNetworkLists(Hashtable request)
307 { 307// {
308 m_log.Info("[FreeSwitchDirectory] HandleLoadNetworkLists called"); 308// m_log.Info("[FreeSwitchDirectory] HandleLoadNetworkLists called");
309 309//
310 // TODO the password we return needs to match that sent in the request, this is hard coded for now 310// // TODO the password we return needs to match that sent in the request, this is hard coded for now
311 string domain = (string) request["domain"]; 311// string domain = (string) request["domain"];
312 312//
313 Hashtable response = new Hashtable(); 313// Hashtable response = new Hashtable();
314 response["content_type"] = "text/xml"; 314// response["content_type"] = "text/xml";
315 response["keepalive"] = false; 315// response["keepalive"] = false;
316 response["int_response_code"] = 200; 316// response["int_response_code"] = 200;
317 response["str_response_string"] = String.Format( 317// response["str_response_string"] = String.Format(
318 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + 318// "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
319 "<document type=\"freeswitch/xml\">\r\n" + 319// "<document type=\"freeswitch/xml\">\r\n" +
320 "<section name=\"directory\" description=\"User Directory\">\r\n" + 320// "<section name=\"directory\" description=\"User Directory\">\r\n" +
321 "<domain name=\"{0}\">\r\n" + 321// "<domain name=\"{0}\">\r\n" +
322 "<params>\r\n" + 322// "<params>\r\n" +
323 "<param name=\"dial-string\" value=\"{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" + 323// "<param name=\"dial-string\" value=\"{{presence_id=${{dialed_user}}@${{dialed_domain}}}}${{sofia_contact(${{dialed_user}}@${{dialed_domain}})}}\"/>\r\n" +
324 "</params>\r\n" + 324// "</params>\r\n" +
325 "<groups name=\"default\"><users/></groups>\r\n" + 325// "<groups name=\"default\"><users/></groups>\r\n" +
326 "<variables>\r\n"+ 326// "<variables>\r\n"+
327 "<variable name=\"default_gateway\" value=\"$${{default_provider}}\"/>\r\n"+ 327// "<variable name=\"default_gateway\" value=\"$${{default_provider}}\"/>\r\n"+
328 "</variables>\r\n"+ 328// "</variables>\r\n"+
329 "</domain>\r\n" + 329// "</domain>\r\n" +
330 "</section>\r\n" + 330// "</section>\r\n" +
331 "</document>\r\n", 331// "</document>\r\n",
332 domain); 332// domain);
333 333//
334 334//
335 return response; 335// return response;
336 } 336// }
337 } 337 }
338} 338}