- fixes comparison of struct against null (no no no)

- fixes IRCBridgeModule's XmlRpc method really paying attention to
  region parameter
- cleans up indentation in IRCBridge code
- fixes ConciergeModule exception on client logout

3 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
index 4fc744b..6265698 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
@@ -486,10 +486,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
         {
 
             m_log.InfoFormat("[IRC-Channel-{0}] Closing channel <{1} to server <{2}:{3}>",
-                    idn, IrcChannel, Server, Port);
+                             idn, IrcChannel, Server, Port);
 
             m_log.InfoFormat("[IRC-Channel-{0}] There are {1} active clients",
-                    idn, clientregions.Count);
+                             idn, clientregions.Count);
 
             irc.Close();
 
@@ -498,7 +498,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
         public void Open()
         {
             m_log.InfoFormat("[IRC-Channel-{0}] Opening channel <{1} to server <{2}:{3}>",
-                    idn, IrcChannel, Server, Port);
+                             idn, IrcChannel, Server, Port);
 
             irc.Open();
 
@@ -524,7 +524,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
         public void AddRegion(RegionState rs)
         {
             m_log.InfoFormat("[IRC-Channel-{0}] Adding region {1} to channel <{2} to server <{3}:{4}>",
-                    idn, rs.Region, IrcChannel, Server, Port);
+                             idn, rs.Region, IrcChannel, Server, Port);
             if (!clientregions.Contains(rs))
             {
                 clientregions.Add(rs);
@@ -540,7 +540,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
         {
 
             m_log.InfoFormat("[IRC-Channel-{0}] Removing region {1} from channel <{2} to server <{3}:{4}>",
-                    idn, rs.Region, IrcChannel, Server, Port);
+                             idn, rs.Region, IrcChannel, Server, Port);
 
             if (clientregions.Contains(rs))
             {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index 094fa6d..47d3265 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
                     if (rs.Region == region)
                     {
                         responseData["server"]    = rs.cs.Server;
-                        responseData["port"]      = rs.cs.Port;
+                        responseData["port"]      = (int)rs.cs.Port;
                         responseData["user"]      = rs.cs.User;
                         responseData["channel"]   = rs.cs.IrcChannel;
                         responseData["enabled"]   = rs.cs.irc.Enabled;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
index 3ebb226..c52375d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
             m_baseNick      = cs.BaseNickname;
             m_randomizeNick = cs.RandomizeNickname;
             m_ircChannel    = cs.IrcChannel;
-            m_port          = (uint) cs.Port;
+            m_port          = cs.Port;
             m_user          = cs.User;
 
             if (m_watchdog == null)