Merge branch 'master' of /var/git/opensim/
						commit
						e89dcdada9
					
				| 
						 | 
				
			
			@ -45,10 +45,20 @@ namespace OpenSim.Services.PresenceService
 | 
			
		|||
                LogManager.GetLogger(
 | 
			
		||||
                MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        protected bool m_allowDuplicatePresences = false;
 | 
			
		||||
 | 
			
		||||
        public PresenceService(IConfigSource config)
 | 
			
		||||
            : base(config)
 | 
			
		||||
        {
 | 
			
		||||
            m_log.Debug("[PRESENCE SERVICE]: Starting presence service");
 | 
			
		||||
 | 
			
		||||
            IConfig presenceConfig = config.Configs["PresenceService"];
 | 
			
		||||
            if (presenceConfig != null)
 | 
			
		||||
            {
 | 
			
		||||
                m_allowDuplicatePresences =
 | 
			
		||||
                        presenceConfig.GetBoolean("AllowDuplicatePresences",
 | 
			
		||||
                                                  m_allowDuplicatePresences);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public bool LoginAgent(string userID, UUID sessionID,
 | 
			
		||||
| 
						 | 
				
			
			@ -57,6 +67,9 @@ namespace OpenSim.Services.PresenceService
 | 
			
		|||
            //PresenceData[] d = m_Database.Get("UserID", userID);
 | 
			
		||||
            //m_Database.Get("UserID", userID);
 | 
			
		||||
 | 
			
		||||
            if (!m_allowDuplicatePresences)
 | 
			
		||||
                m_Database.Delete("UserID", userID.ToString());
 | 
			
		||||
 | 
			
		||||
            PresenceData data = new PresenceData();
 | 
			
		||||
 | 
			
		||||
            data.UserID = userID;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -107,6 +107,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 | 
			
		|||
[PresenceService]
 | 
			
		||||
    ; for the server connector
 | 
			
		||||
    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 | 
			
		||||
    ; Set this to true to allow the use of advanced web services and multiple
 | 
			
		||||
    ; bots using one account
 | 
			
		||||
    AllowDuplicatePresences = false;
 | 
			
		||||
 | 
			
		||||
[AvatarService]
 | 
			
		||||
    ; for the server connector
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue