minor: shortern warning messages in EntityTransferModule when UpdateAgent() fails
							parent
							
								
									803fa36b68
								
							
						
					
					
						commit
						e05d11faa5
					
				|  | @ -832,8 +832,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | ||||||
|                 } |                 } | ||||||
| 
 | 
 | ||||||
|                 m_log.WarnFormat( |                 m_log.WarnFormat( | ||||||
|                     "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}.  Keeping avatar in source region.", |                     "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}.  Keeping avatar in {2}", | ||||||
|                     sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName); |                     sp.Name, finalDestination.RegionName, sp.Scene.Name); | ||||||
| 
 | 
 | ||||||
|                 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established."); |                 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established."); | ||||||
|                 return; |                 return; | ||||||
|  | @ -1056,8 +1056,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | ||||||
|                 } |                 } | ||||||
| 
 | 
 | ||||||
|                 m_log.WarnFormat( |                 m_log.WarnFormat( | ||||||
|                     "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}.  Keeping avatar in source region.", |                     "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}.  Keeping avatar in {2}", | ||||||
|                     sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName); |                     sp.Name, finalDestination.RegionName, sp.Scene.Name); | ||||||
| 
 | 
 | ||||||
|                 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established."); |                 Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established."); | ||||||
|                 return; |                 return; | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Justin Clark-Casey (justincc)
						Justin Clark-Casey (justincc)