aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/MessagingServer
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 23:03:39 +0000
committerDr Scofield2008-06-27 23:03:39 +0000
commit748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch)
tree58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Grid/MessagingServer
parentmore warnings to go. (diff)
downloadopensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip
opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz
opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2
opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Grid/MessagingServer')
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs12
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs3
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs4
4 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 91f2101..781b49b 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer
48 private MessageServerConfig Cfg; 48 private MessageServerConfig Cfg;
49 private MessageService msgsvc; 49 private MessageService msgsvc;
50 50
51 private LLUUID m_lastCreatedUser = LLUUID.Random(); 51 // private LLUUID m_lastCreatedUser = LLUUID.Random();
52 52
53 [STAThread] 53 [STAThread]
54 public static void Main(string[] args) 54 public static void Main(string[] args)
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index cec596f..7be62b0 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.MessagingServer
58 private Hashtable m_presence_BackReferences = new Hashtable(); 58 private Hashtable m_presence_BackReferences = new Hashtable();
59 59
60 // Hashtable containing work units that need to be processed 60 // Hashtable containing work units that need to be processed
61 private Hashtable m_unProcessedWorkUnits = new Hashtable(); 61 // private Hashtable m_unProcessedWorkUnits = new Hashtable();
62 62
63 public MessageService(MessageServerConfig cfg) 63 public MessageService(MessageServerConfig cfg)
64 { 64 {
@@ -588,9 +588,9 @@ namespace OpenSim.Grid.MessagingServer
588 uint regX = Convert.ToUInt32((string)responseData["region_locx"]); 588 uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
589 uint regY = Convert.ToUInt32((string)responseData["region_locy"]); 589 uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
590 string internalIpStr = (string)responseData["sim_ip"]; 590 string internalIpStr = (string)responseData["sim_ip"];
591 uint port = Convert.ToUInt32(responseData["sim_port"]); 591 // uint port = Convert.ToUInt32(responseData["sim_port"]);
592 string externalUri = (string)responseData["sim_uri"]; 592 // string externalUri = (string)responseData["sim_uri"];
593 string neighbourExternalUri = externalUri; 593 // string neighbourExternalUri = externalUri;
594 594
595 regionProfile = new RegionProfileData(); 595 regionProfile = new RegionProfileData();
596 regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); 596 regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
@@ -655,7 +655,7 @@ namespace OpenSim.Grid.MessagingServer
655 throw(ex); 655 throw(ex);
656 } 656 }
657 Hashtable GridRespData = (Hashtable)UserResp.Value; 657 Hashtable GridRespData = (Hashtable)UserResp.Value;
658 Hashtable griddatahash = GridRespData; 658 // Hashtable griddatahash = GridRespData;
659 659
660 // Process Response 660 // Process Response
661 if (GridRespData.ContainsKey("responsestring")) 661 if (GridRespData.ContainsKey("responsestring"))
@@ -704,7 +704,7 @@ namespace OpenSim.Grid.MessagingServer
704 throw (ex); 704 throw (ex);
705 } 705 }
706 Hashtable UserRespData = (Hashtable)UserResp.Value; 706 Hashtable UserRespData = (Hashtable)UserResp.Value;
707 Hashtable userdatahash = UserRespData; 707 // Hashtable userdatahash = UserRespData;
708 708
709 // Process Response 709 // Process Response
710 if (UserRespData.ContainsKey("responsestring")) 710 if (UserRespData.ContainsKey("responsestring"))
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index e02aa06..39fcadb 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -118,7 +118,8 @@ namespace OpenSim.Grid.MessagingServer
118 try 118 try
119 { 119 {
120 120
121 XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000); 121 // XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
122 RegionReq.Send(whichRegion.httpServerURI, 6000);
122 } 123 }
123 catch (WebException) 124 catch (WebException)
124 { 125 {
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index efe077d..13bf290 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.MessagingServer
84 84
85 public class PostXMPPStreamHandler : BaseStreamHandler 85 public class PostXMPPStreamHandler : BaseStreamHandler
86 { 86 {
87 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 87 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
88 88
89 public override byte[] Handle(string path, Stream request, 89 public override byte[] Handle(string path, Stream request,
90 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 90 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.MessagingServer
94 LLUUID assetId; 94 LLUUID assetId;
95 if (param.Length > 0) 95 if (param.Length > 0)
96 LLUUID.TryParse(param, out assetId); 96 LLUUID.TryParse(param, out assetId);
97 byte[] txBuffer = new byte[4096]; 97 // byte[] txBuffer = new byte[4096];
98 98
99 // TODO: Read POST serialize XMPP stanzas 99 // TODO: Read POST serialize XMPP stanzas
100 100