a8fa8af9fc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-01-30 23:44:06 -05:00  
				
					
						
							
							
								 
						
							
							
								ce4faf497f 
								
							
								 
							
						 
						
							
							
								
								Add config option to Regions.ini for new maptile feature  
							
							
							
						 
						
							2013-01-30 23:41:32 -05:00  
				
					
						
							
							
								 
						
							
							
								fac72d540b 
								
							
								 
							
						 
						
							
							
								
								Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region.  
							
							... 
							
							
							
							Signed-off-by: BlueWall <jamesh@bluewallgroup.com> 
							
						 
						
							2013-01-30 23:37:02 -05:00  
				
					
						
							
							
								 
						
							
							
								a0ef3df194 
								
							
								 
							
						 
						
							
							
								
								Add JsonTestStore to determine if a JsonStore is associated with  
							
							... 
							
							
							
							a particular UUID. 
							
						 
						
							2013-01-30 14:45:03 -08:00  
				
					
						
							
							
								 
						
							
							
								52ea6eadae 
								
							
								 
							
						 
						
							
							
								
								* This adds a bit more to the previous flying roll effect by adding additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.  
							
							
							
						 
						
							2013-01-30 07:34:48 -05:00  
				
					
						
							
							
								 
						
							
							
								7c4e0ff03c 
								
							
								 
							
						 
						
							
							
								
								* Adds a satisfying angular roll when an avatar is flying and turning.  (General, not physics).  Makes flying not feel as stiff.  
							
							
							
						 
						
							2013-01-30 06:22:05 -05:00  
				
					
						
							
							
								 
						
							
							
								d42c7afe3f 
								
							
								 
							
						 
						
							
							
								
								Add JsonDestroyStore() basic regression test  
							
							
							
						 
						
							2013-01-30 05:56:30 +00:00  
				
					
						
							
							
								 
						
							
							
								5a22efe69c 
								
							
								 
							
						 
						
							
							
								
								refactor: Make invocations of json store functions from the regression test simpler  
							
							
							
						 
						
							2013-01-30 05:49:28 +00:00  
				
					
						
							
							
								 
						
							
							
								addf9ada49 
								
							
								 
							
						 
						
							
							
								
								Add regression test for script func JsonRemoveValue()  
							
							
							
						 
						
							2013-01-30 05:39:34 +00:00  
				
					
						
							
							
								 
						
							
							
								5ac84a3793 
								
							
								 
							
						 
						
							
							
								
								Fix issue where lsl -> c# generation in co-operative termination mode did not correctly handle single statement versions of for, while and do-while loops.  
							
							... 
							
							
							
							Add regression tests to validate the fix.
This problem will not affect the default abort termination mode. 
							
						 
						
							2013-01-30 03:52:22 +00:00  
				
					
						
							
							
								 
						
							
							
								a61ecee227 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix physics repositioning when under ground to only happen  
							
							... 
							
							
							
							for physical objects. Non-physical objects can go anywhere they want. 
							
						 
						
							2013-01-29 17:04:28 -08:00  
				
					
						
							
							
								 
						
							
							
								39700445f2 
								
							
								 
							
						 
						
							
							
								
								minor: change name of json script tests to JsonStoreScriptModuleTests instead of copy/pasted LSL_ApiInventoryTests  
							
							
							
						 
						
							2013-01-29 04:36:41 +00:00  
				
					
						
							
							
								 
						
							
							
								ccdf86c737 
								
							
								 
							
						 
						
							
							
								
								minor: remove EnableLogging() left over in CoopTerminationTests  
							
							
							
						 
						
							2013-01-29 04:35:05 +00:00  
				
					
						
							
							
								 
						
							
							
								e0f4e91d22 
								
							
								 
							
						 
						
							
							
								
								Try ignoring json tests if they can't be run due to being on <=.net 3.5  
							
							
							
						 
						
							2013-01-29 04:26:47 +00:00  
				
					
						
							
							
								 
						
							
							
								fd34a75cde 
								
							
								 
							
						 
						
							
							
								
								minor: Tidy up disabled logging on AssetTransactionModule for future use.  Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.  
							
							
							
						 
						
							2013-01-29 04:03:33 +00:00  
				
					
						
							
							
								 
						
							
							
								77cd74ded6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-01-29 03:59:38 +00:00  
				
					
						
							
							
								 
						
							
							
								ca26ff9436 
								
							
								 
							
						 
						
							
							
								
								minor: remove some mono compile warnings in XEngine.cs  
							
							
							
						 
						
							2013-01-29 03:58:11 +00:00  
				
					
						
							
							
								 
						
							
							
								47f09ed4c1 
								
							
								 
							
						 
						
							
							
								
								BulletSim: enable angular vertical attraction.  
							
							... 
							
							
							
							Increase terrain collision margin to help vehicles from tunneling
into same. 
							
						 
						
							2013-01-28 17:21:13 -08:00  
				
					
						
							
							
								 
						
							
							
								531d0429d1 
								
							
								 
							
						 
						
							
							
								
								BulletSim: first unit test: vehicle angular attraction  
							
							
							
						 
						
							2013-01-28 17:08:34 -08:00  
				
					
						
							
							
								 
						
							
							
								e9aff0a91d 
								
							
								 
							
						 
						
							
							
								
								BulletSim: do not zero an avatar's standing velocity if it is standing  
							
							... 
							
							
							
							on a moving object.
Rearrange pre/post action subscription code to put more in locks.
Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings).
Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure. 
							
						 
						
							2013-01-28 15:11:50 -08:00  
				
					
						
							
							
								 
						
							
							
								e4c6a19940 
								
							
								 
							
						 
						
							
							
								
								BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed to unmanaged code.  
							
							
							
						 
						
							2013-01-28 15:11:20 -08:00  
				
					
						
							
							
								 
						
							
							
								f6380a3ad3 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix the trimming of colliders so only the top 25 are returned.  
							
							
							
						 
						
							2013-01-28 09:02:01 -08:00  
				
					
						
							
							
								 
						
							
							
								2cd56014a7 
								
							
								 
							
						 
						
							
							
								
								BulletSim: update Bullet with profiling disabled. This seems to fix the memory leak problem.  
							
							
							
						 
						
							2013-01-28 06:21:51 -08:00  
				
					
						
							
							
								 
						
							
							
								aea90c198f 
								
							
								 
							
						 
						
							
							
								
								BulletSim: reorder dependencies for tests and specify path for meshing dll since it is placed in the Physics directory  
							
							
							
						 
						
							2013-01-27 13:37:58 -08:00  
				
					
						
							
							
								 
						
							
							
								2c5f0677e5 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix reference path for BulletSim tests in prebuild.xml  
							
							
							
						 
						
							2013-01-27 13:09:18 -08:00  
				
					
						
							
							
								 
						
							
							
								b546af9ac2 
								
							
								 
							
						 
						
							
							
								
								BulletSim: simplify the initialization of some of the parameters.  
							
							... 
							
							
							
							Disable vertical attraction for vehicles by default (for the moment).
Fix bug where vehicle would go crazy when velocity got above a
   certain speed. 
							
						 
						
							2013-01-27 12:50:07 -08:00  
				
					
						
							
							
								 
						
							
							
								26d4596080 
								
							
								 
							
						 
						
							
							
								
								BulletSim: reinstate the supression of rotational velocity for vehicles  
							
							
							
						 
						
							2013-01-27 12:50:07 -08:00  
				
					
						
							
							
								 
						
							
							
								a345a2feb7 
								
							
								 
							
						 
						
							
							
								
								BulletSim: add framework for BulletSim unit tests. No tests yet.  
							
							
							
						 
						
							2013-01-27 12:50:06 -08:00  
				
					
						
							
							
								 
						
							
							
								05adf4b30f 
								
							
								 
							
						 
						
							
							
								
								BulletSim: disable center-of-mass computation because it does not work yet  
							
							
							
						 
						
							2013-01-27 12:50:06 -08:00  
				
					
						
							
							
								 
						
							
							
								80f0a978db 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix compile error from last commit  
							
							
							
						 
						
							2013-01-27 12:50:06 -08:00  
				
					
						
							
							
								 
						
							
							
								36f401d850 
								
							
								 
							
						 
						
							
							
								
								BulletSim: parameterize the value for gravity reduction for ground vehicles on the ground. Set defaults for vehicle factors to one. Debug logging changes.  
							
							
							
						 
						
							2013-01-27 12:50:05 -08:00  
				
					
						
							
							
								 
						
							
							
								ddef8f16e5 
								
							
								 
							
						 
						
							
							
								
								BulletSim: first attempt at reporting top colliders  
							
							
							
						 
						
							2013-01-27 12:50:05 -08:00  
				
					
						
							
							
								 
						
							
							
								dd08e1fba6 
								
							
								 
							
						 
						
							
							
								
								BulletSim: parameterize several vehicle debugging values: physical linear and angular force factors now default to less than 1 (0.2) vehicle friction and restitution now default to low values  
							
							
							
						 
						
							2013-01-27 12:50:05 -08:00  
				
					
						
							
							
								 
						
							
							
								c44a8e9f92 
								
							
								 
							
						 
						
							
							
								
								BulletSim: finish the post step event for physical object actions. Modify vehicle to use post step event for logging.  
							
							
							
						 
						
							2013-01-27 12:50:04 -08:00  
				
					
						
							
							
								 
						
							
							
								776cc33541 
								
							
								 
							
						 
						
							
							
								
								Prevent items being destroyed by rename operations. Renaming of a wearable also  
							
							... 
							
							
							
							sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs 
							
						 
						
							2013-01-27 01:07:37 +00:00  
				
					
						
							
							
								 
						
							
							
								b0cff35d96 
								
							
								 
							
						 
						
							
							
								
								Fix issue where the "set terrain texture" console command did not tell the viewers that textures had updated (hence they did not display the changes).  
							
							... 
							
							
							
							Addresses http://opensimulator.org/mantis/view.php?id=6513  
							
						 
						
							2013-01-26 04:27:01 +00:00  
				
					
						
							
							
								 
						
							
							
								53833babf9 
								
							
								 
							
						 
						
							
							
								
								Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so that these can be triggered by future code (not yet implemented).  
							
							... 
							
							
							
							Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused.
An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515 
Thanks Garmin Kawaguichi and Signpost Marv. 
							
						 
						
							2013-01-26 03:57:51 +00:00  
				
					
						
							
							
								 
						
							
							
								8ea112a5b2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-01-26 02:58:10 +00:00  
				
					
						
							
							
								 
						
							
							
								ceabb1b49a 
								
							
								 
							
						 
						
							
							
								
								Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParams  
							
							... 
							
							
							
							Correction so that scripts can turn Flexi off as well as on. 
							
						 
						
							2013-01-26 02:55:24 +00:00  
				
					
						
							
							
								 
						
							
							
								5128ae7b86 
								
							
								 
							
						 
						
							
							
								
								* This adds llVolumeDetect functionality to the C# implementation of BulletSim.  
							
							
							
						 
						
							2013-01-25 20:15:37 -05:00  
				
					
						
							
							
								 
						
							
							
								c3fb114461 
								
							
								 
							
						 
						
							
							
								
								minor: Fix full scene part console report to show proper Light* names rather than all wrongly FlexiDrag  
							
							
							
						 
						
							2013-01-26 00:31:50 +00:00  
				
					
						
							
							
								 
						
							
							
								d6d6618f62 
								
							
								 
							
						 
						
							
							
								
								minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable any enabled logging from previous tests  
							
							
							
						 
						
							2013-01-26 00:28:45 +00:00  
				
					
						
							
							
								 
						
							
							
								7a139f8e53 
								
							
								 
							
						 
						
							
							
								
								Remove the accidental PrimShapes column that I added back to the SQLite region store  
							
							
							
						 
						
							2013-01-25 04:35:06 +00:00  
				
					
						
							
							
								 
						
							
							
								7789415148 
								
							
								 
							
						 
						
							
							
								
								Fix tests by adding DynAttrs add column commands to RegionStore.migrations (these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago).  
							
							
							
						 
						
							2013-01-25 04:22:32 +00:00  
				
					
						
							
							
								 
						
							
							
								6daf559fb6 
								
							
								 
							
						 
						
							
							
								
								Added unit tests for Dynamic Attributes  
							
							
							
						 
						
							2013-01-25 04:03:30 +00:00  
				
					
						
							
							
								 
						
							
							
								23f0610f0c 
								
							
								 
							
						 
						
							
							
								
								Disabled DAExampleModule  
							
							
							
						 
						
							2013-01-25 04:03:28 +00:00  
				
					
						
							
							
								 
						
							
							
								af6a7cf95d 
								
							
								 
							
						 
						
							
							
								
								Added DynAttrs to the serialized XML format of prims. When copying prims, use deep copy for DynAttrs.  
							
							
							
						 
						
							2013-01-25 04:03:26 +00:00  
				
					
						
							
							
								 
						
							
							
								86802bcf93 
								
							
								 
							
						 
						
							
							
								
								Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes  
							
							
							
						 
						
							2013-01-25 04:03:24 +00:00  
				
					
						
							
							
								 
						
							
							
								fdec05a15e 
								
							
								 
							
						 
						
							
							
								
								Stopped storing dynamic attributes in the PrimShape  
							
							
							
						 
						
							2013-01-25 04:03:20 +00:00  
				
					
						
							
							
								 
						
							
							
								8b4441d940 
								
							
								 
							
						 
						
							
							
								
								Changed DAMap to be the container of "data stores", which are OSDMaps. Store names must have at least 4 characters.  
							
							
							
						 
						
							2013-01-25 04:03:18 +00:00