diff options
author | Justin Clarke Casey | 2008-11-17 16:22:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 16:22:21 +0000 |
commit | dcfd343a1e9dacb800e1272f38eefad3c5d9bf53 (patch) | |
tree | de1da1538f26d4af5876652703857ffb2240262f | |
parent | * Remove the TransferRequest and hip debugging console output that crept in r... (diff) | |
download | opensim-SC_OLD-dcfd343a1e9dacb800e1272f38eefad3c5d9bf53.zip opensim-SC_OLD-dcfd343a1e9dacb800e1272f38eefad3c5d9bf53.tar.gz opensim-SC_OLD-dcfd343a1e9dacb800e1272f38eefad3c5d9bf53.tar.bz2 opensim-SC_OLD-dcfd343a1e9dacb800e1272f38eefad3c5d9bf53.tar.xz |
minor: remove mono compiler warnings
3 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 77da306..b4a0c21 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs | |||
@@ -547,7 +547,7 @@ namespace OpenSim.Grid.MessagingServer | |||
547 | else | 547 | else |
548 | m_log.InfoFormat("[SERVER] Registered with {0}", srv); | 548 | m_log.InfoFormat("[SERVER] Registered with {0}", srv); |
549 | } | 549 | } |
550 | catch (Exception ex) | 550 | catch |
551 | { | 551 | { |
552 | m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); | 552 | m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); |
553 | success = false; | 553 | success = false; |
@@ -593,9 +593,9 @@ namespace OpenSim.Grid.MessagingServer | |||
593 | if(!UserRespData.ContainsKey("responsestring")) | 593 | if(!UserRespData.ContainsKey("responsestring")) |
594 | success = false; | 594 | success = false; |
595 | } | 595 | } |
596 | catch (Exception ex) | 596 | catch |
597 | { | 597 | { |
598 | m_log.Error("Unable to connect to grid. User server not running?"); | 598 | m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); |
599 | success = false; | 599 | success = false; |
600 | } | 600 | } |
601 | } | 601 | } |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index b106435..88c0680 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
50 | 50 | ||
51 | #region IRegionModule Members | 51 | #region IRegionModule Members |
52 | 52 | ||
53 | private bool gridmode = false; | 53 | //private bool gridmode = false; |
54 | 54 | ||
55 | private IMessageTransferModule m_TransferModule = null; | 55 | private IMessageTransferModule m_TransferModule = null; |
56 | 56 | ||
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs index 8c9abc1..c5b5ebb 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -565,23 +565,23 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
565 | /// </summary> | 565 | /// </summary> |
566 | /// <param name="regionID">UUID of region to get the region handle for</param> | 566 | /// <param name="regionID">UUID of region to get the region handle for</param> |
567 | /// <returns></returns> | 567 | /// <returns></returns> |
568 | private ulong getLocalRegionHandleFromUUID(UUID regionID) | 568 | // private ulong getLocalRegionHandleFromUUID(UUID regionID) |
569 | { | 569 | // { |
570 | ulong returnhandle = 0; | 570 | // ulong returnhandle = 0; |
571 | 571 | // | |
572 | lock (m_Scenes) | 572 | // lock (m_Scenes) |
573 | { | 573 | // { |
574 | foreach (Scene sn in m_Scenes) | 574 | // foreach (Scene sn in m_Scenes) |
575 | { | 575 | // { |
576 | if (sn.RegionInfo.RegionID == regionID) | 576 | // if (sn.RegionInfo.RegionID == regionID) |
577 | { | 577 | // { |
578 | returnhandle = sn.RegionInfo.RegionHandle; | 578 | // returnhandle = sn.RegionInfo.RegionHandle; |
579 | break; | 579 | // break; |
580 | } | 580 | // } |
581 | } | 581 | // } |
582 | } | 582 | // } |
583 | return returnhandle; | 583 | // return returnhandle; |
584 | } | 584 | // } |
585 | 585 | ||
586 | /// <summary> | 586 | /// <summary> |
587 | /// Takes a GridInstantMessage and converts it into a Hashtable for XMLRPC | 587 | /// Takes a GridInstantMessage and converts it into a Hashtable for XMLRPC |