Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index ca956fb..a014798 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -231,12 +231,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             if (m_server == null || m_baseNick == null || m_ircChannel == null || m_user == null)
                 throw new Exception("Invalid connector configuration");
 
-            // Generate an initial nickname if randomizing is enabled
+            // Generate an initial nickname
 
             if (m_randomizeNick)
-            {
                 m_nick = m_baseNick + Util.RandomClass.Next(1, 99);
-            }
+            else 
+                m_nick = m_baseNick;
 
             m_log.InfoFormat("[IRC-Connector-{0}]: Initialization complete", idn);