Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
index 2098625..7056e01 100644
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Client.MXP.PacketHandler
         private readonly IList<MXPClientView> m_sessionsToRemove = new List<MXPClientView>();
 
         private readonly int m_port;
-        private readonly bool m_accountsAuthenticate;
+//        private readonly bool m_accountsAuthenticate;
 
         private readonly String m_programName;
         private readonly byte m_programMajorVersion;
@@ -76,7 +76,7 @@ namespace OpenSim.Client.MXP.PacketHandler
         public MXPPacketServer(int port, Dictionary<UUID, Scene> scenes, bool accountsAuthenticate)
         {
             m_port = port;
-            m_accountsAuthenticate = accountsAuthenticate;
+//            m_accountsAuthenticate = accountsAuthenticate;
 
             m_scenes = scenes;
 
@@ -491,7 +491,6 @@ namespace OpenSim.Client.MXP.PacketHandler
 
         public bool AuthoriseUser(string participantName, string password, UUID sceneId, out UserAccount account)
         {
-            UUID userId = UUID.Zero;
             string firstName = "";
             string lastName = "";
             account = null;