aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs10
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs6
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs9
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppSerializer.cs4
5 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 5249aa2..5aba086 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -79,17 +79,17 @@ namespace OpenSim.Framework.Communications.Capabilities
79 private CapsHandlers m_capsHandlers; 79 private CapsHandlers m_capsHandlers;
80 80
81 private static readonly string m_requestPath = "0000/"; 81 private static readonly string m_requestPath = "0000/";
82 private static readonly string m_mapLayerPath = "0001/"; 82 // private static readonly string m_mapLayerPath = "0001/";
83 private static readonly string m_newInventory = "0002/"; 83 private static readonly string m_newInventory = "0002/";
84 //private static readonly string m_requestTexture = "0003/"; 84 //private static readonly string m_requestTexture = "0003/";
85 private static readonly string m_notecardUpdatePath = "0004/"; 85 private static readonly string m_notecardUpdatePath = "0004/";
86 private static readonly string m_notecardTaskUpdatePath = "0005/"; 86 private static readonly string m_notecardTaskUpdatePath = "0005/";
87 private static readonly string m_fetchInventoryPath = "0006/"; 87 // private static readonly string m_fetchInventoryPath = "0006/";
88 88
89 // The following two entries are in a module, however, there also here so that we don't re-assign 89 // The following two entries are in a module, however, there also here so that we don't re-assign
90 // the path to another cap by mistake. 90 // the path to another cap by mistake.
91 private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module. 91 // private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module.
92 private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module. 92 // private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module.
93 93
94 //private string eventQueue = "0100/"; 94 //private string eventQueue = "0100/";
95 private BaseHttpServer m_httpListener; 95 private BaseHttpServer m_httpListener;
@@ -246,7 +246,7 @@ namespace OpenSim.Framework.Communications.Capabilities
246 // multiple fetch-folder maps are allowed within the larger folders map. 246 // multiple fetch-folder maps are allowed within the larger folders map.
247 public string FetchInventoryRequest(string request, string path, string param) 247 public string FetchInventoryRequest(string request, string path, string param)
248 { 248 {
249 string unmodifiedRequest = request.ToString(); 249 // string unmodifiedRequest = request.ToString();
250 250
251 //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest); 251 //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest);
252 m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName); 252 m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName);
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index e8353b4..5de0c71 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -282,7 +282,7 @@ namespace OpenSim.Framework.Communications
282 if (profileData != null) 282 if (profileData != null)
283 { 283 {
284 returnstring = new string[2]; 284 returnstring = new string[2];
285 LLUUID profileId = profileData.ID; 285 // LLUUID profileId = profileData.ID;
286 returnstring[0] = profileData.FirstName; 286 returnstring[0] = profileData.FirstName;
287 returnstring[1] = profileData.SurName; 287 returnstring[1] = profileData.SurName;
288 lock (m_nameRequestCache) 288 lock (m_nameRequestCache)
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 6fdd06a..113e3f0 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Communications
95 95
96 // Response 96 // Response
97 private XmlRpcResponse xmlRpcResponse; 97 private XmlRpcResponse xmlRpcResponse;
98 private XmlRpcResponse defaultXmlRpcResponse; 98 // private XmlRpcResponse defaultXmlRpcResponse;
99 99
100 private string welcomeMessage; 100 private string welcomeMessage;
101 private string startLocation; 101 private string startLocation;
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Communications
117 loginError = new Hashtable(); 117 loginError = new Hashtable();
118 uiConfigHash = new Hashtable(); 118 uiConfigHash = new Hashtable();
119 119
120 defaultXmlRpcResponse = new XmlRpcResponse(); 120 // defaultXmlRpcResponse = new XmlRpcResponse();
121 userProfile = new UserInfo(); 121 userProfile = new UserInfo();
122 inventoryRoot = new ArrayList(); 122 inventoryRoot = new ArrayList();
123 initialOutfit = new ArrayList(); 123 initialOutfit = new ArrayList();
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Communications
126 inventoryLibraryOwner = new ArrayList(); 126 inventoryLibraryOwner = new ArrayList();
127 127
128 xmlRpcResponse = new XmlRpcResponse(); 128 xmlRpcResponse = new XmlRpcResponse();
129 defaultXmlRpcResponse = new XmlRpcResponse(); 129 // defaultXmlRpcResponse = new XmlRpcResponse();
130 130
131 SetDefaultValues(); 131 SetDefaultValues();
132 } 132 }
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index f6c33a8..b71a590 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Communications
58 { 58 {
59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
60 60
61 private string realuri; 61 // private string realuri;
62 62
63 #region member variables 63 #region member variables
64 64
@@ -229,7 +229,7 @@ namespace OpenSim.Framework.Communications
229 sb.Append(kv.Value); 229 sb.Append(kv.Value);
230 } 230 }
231 } 231 }
232 realuri = sb.ToString(); 232 // realuri = sb.ToString();
233 //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri); 233 //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri);
234 return new Uri(sb.ToString()); 234 return new Uri(sb.ToString());
235 } 235 }
@@ -250,8 +250,9 @@ namespace OpenSim.Framework.Communications
250 if (read > 0) 250 if (read > 0)
251 { 251 {
252 _resource.Write(_readbuf, 0, read); 252 _resource.Write(_readbuf, 0, read);
253 IAsyncResult asynchronousResult = 253 // IAsyncResult asynchronousResult =
254 s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s); 254 // s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
255 s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
255 256
256 // TODO! Implement timeout, without killing the server 257 // TODO! Implement timeout, without killing the server
257 //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true); 258 //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
index 30a9eac..eb9dabe 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
@@ -38,8 +38,8 @@ namespace OpenSim.Framework.Communications.XMPP
38{ 38{
39 public class XmppSerializer 39 public class XmppSerializer
40 { 40 {
41 private static readonly ILog _log = 41 // private static readonly ILog _log =
42 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 // need to do it this way, as XmlSerializer(type, extratypes) 44 // need to do it this way, as XmlSerializer(type, extratypes)
45 // does not work on mono (at least). 45 // does not work on mono (at least).