Compare commits
	
		
			5 Commits 
		
	
	
		
			master
			...
			0.6.7-post
		
	
	| Author | SHA1 | Date | 
|---|---|---|
|  dahlia | c2b7ef7d60 | |
|  Teravus Ovares (Dan Olivares) | a9da2786cf | |
|  Justin Clark-Casey (justincc) | 4e678d3d16 | |
|  Justin Clark-Casey | 85e9d774ea | |
|  Justin Clark-Casey (justincc) | 7f13ac0f48 | 
|  | @ -30,7 +30,7 @@ namespace OpenSim | |||
|     public class VersionInfo | ||||
|     { | ||||
|         private const string VERSION_NUMBER = "0.6.7"; | ||||
|         private const Flavour VERSION_FLAVOUR = Flavour.RC1; | ||||
|         private const Flavour VERSION_FLAVOUR = Flavour.Post_Fixes; | ||||
| 
 | ||||
|         public enum Flavour | ||||
|         { | ||||
|  |  | |||
|  | @ -3390,8 +3390,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
|         // Event called by the physics plugin to tell the avatar about a collision. | ||||
|         private void PhysicsCollisionUpdate(EventArgs e) | ||||
|         { | ||||
|             if ((e == null) || m_invulnerable) | ||||
|             if (e == null) | ||||
|                 return; | ||||
| 
 | ||||
|             if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) | ||||
|                 UpdateMovementAnimations(); | ||||
| 
 | ||||
|             if (m_invulnerable) | ||||
|                 return; | ||||
|              | ||||
|             CollisionEventUpdate collisionData = (CollisionEventUpdate)e; | ||||
|             Dictionary<uint, float> coldata = collisionData.m_objCollisionList; | ||||
|             float starthealth = Health; | ||||
|  |  | |||
|  | @ -58,7 +58,7 @@ LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" | |||
| AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | ||||
| StorageProvider = "OpenSim.Data.MySQL.dll" | ||||
| ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" | ||||
| ; Realm = "auth" | ||||
| ; Realm = "users" | ||||
| 
 | ||||
| ; * This is the new style user service. | ||||
| ; * "Realm" is the table that is used for user lookup. | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue