6f5222e863 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-05-07 18:02:25 -07:00  
				
					
						
							
							
								 
						
							
							
								e92c05ebbd 
								
							
								 
							
						 
						
							
							
								
								Added AvatarPickerSearch capability handler.  
							
							
							
						 
						
							2013-05-07 18:01:48 -07:00  
				
					
						
							
							
								 
						
							
							
								ac6dcd35fb 
								
							
								 
							
						 
						
							
							
								
								Bulletsim: and the rotational friction.  
							
							... 
							
							
							
							Signed-off-by: Robert Adams <Robert.Adams@intel.com> 
							
						 
						
							2013-05-07 07:14:10 -07:00  
				
					
						
							
							
								 
						
							
							
								f247ae1a75 
								
							
								 
							
						 
						
							
							
								
								BulletSim: Another way to create vehicle framed friction.  
							
							... 
							
							
							
							Signed-off-by: Robert Adams <Robert.Adams@intel.com> 
							
						 
						
							2013-05-07 07:14:06 -07:00  
				
					
						
							
							
								 
						
							
							
								ddd97cb78e 
								
							
								 
							
						 
						
							
							
								
								BulletSim: normalize quaternian rotations when building compound linksets.  
							
							... 
							
							
							
							Attempt to fix vehicles being twisted off the ground when they go physical. 
							
						 
						
							2013-05-06 18:06:34 -07:00  
				
					
						
							
							
								 
						
							
							
								84118c5735 
								
							
								 
							
						 
						
							
							
								
								BulletSim: properly free references to simple convex hull shapes. Didn't  
							
							... 
							
							
							
							loose memory since shapes are shared but did mess up usage accounting. 
							
						 
						
							2013-05-06 18:05:37 -07:00  
				
					
						
							
							
								 
						
							
							
								1c6b8293d7 
								
							
								 
							
						 
						
							
							
								
								Step 3: Commit the Avination XEstate estate comms handler  
							
							... 
							
							
							
							This adds estate-wide Teleport Home and Teleport All User Home as well 
							
						 
						
							2013-05-07 00:52:40 +01:00  
				
					
						
							
							
								 
						
							
							
								5d5edde429 
								
							
								 
							
						 
						
							
							
								
								Step 2: commit the IEstateModuleInterface changes needed  
							
							
							
						 
						
							2013-05-07 00:37:45 +01:00  
				
					
						
							
							
								 
						
							
							
								4c83b5e719 
								
							
								 
							
						 
						
							
							
								
								Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually  
							
							
							
						 
						
							2013-05-07 00:31:11 +01:00  
				
					
						
							
							
								 
						
							
							
								93e1986d69 
								
							
								 
							
						 
						
							
							
								
								BulletSim: apply linear and angular friction in vehicle coordinates  
							
							... 
							
							
							
							and not world coordinates. 
							
						 
						
							2013-05-06 16:48:01 -07:00  
				
					
						
							
							
								 
						
							
							
								045aaa838a 
								
							
								 
							
						 
						
							
							
								
								BulletSim: remove friction calcuation from BSMotor and move linear and  
							
							... 
							
							
							
							angular friction computation into linear and angular movement code.
The friction wasn't being applied properly. This will make it so vehicles
don't drift as much and the drift is tunable by changing the friction
timescales. 
							
						 
						
							2013-05-06 13:32:26 -07:00  
				
					
						
							
							
								 
						
							
							
								bf31896983 
								
							
								 
							
						 
						
							
							
								
								BulletSim: simplify parameter specification by reducing the number of  
							
							... 
							
							
							
							specifications required for simple properties with defaults. 
							
						 
						
							2013-05-06 13:32:24 -07:00  
				
					
						
							
							
								 
						
							
							
								f9fb1484aa 
								
							
								 
							
						 
						
							
							
								
								BulletSim: extend BSActorLockAxis to allow locking linear movement in  
							
							... 
							
							
							
							addition to angular movement. Not enabled by anything yet. 
							
						 
						
							2013-05-06 13:32:22 -07:00  
				
					
						
							
							
								 
						
							
							
								90f03ccd42 
								
							
								 
							
						 
						
							
							
								
								Added new method to Remote Admin for reloading the estate settings. This is meant to be called when some other program has changed the data on the backend.  
							
							
							
						 
						
							2013-05-06 11:47:55 -07:00  
				
					
						
							
							
								 
						
							
							
								a81ddf3d70 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-05-06 09:18:17 -07:00  
				
					
						
							
							
								 
						
							
							
								ad00466483 
								
							
								 
							
						 
						
							
							
								
								Minor reordering of operations on NewUserConnection. The agent circuit needs to be added earlier for some of the checks to work correctly.  
							
							
							
						 
						
							2013-05-06 09:17:54 -07:00  
				
					
						
							
							
								 
						
							
							
								1ffa69f691 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bulletsim4  
							
							
							
						 
						
							2013-05-03 14:25:52 -07:00  
				
					
						
							
							
								 
						
							
							
								5d25bb3084 
								
							
								 
							
						 
						
							
							
								
								BulletSim: zero vehicle motion when changing vehicle type.  
							
							... 
							
							
							
							Rebuild compound linkset of any child in the linkset changes shape.
Comments and better detailed logging messages. 
							
						 
						
							2013-05-03 14:23:53 -07:00  
				
					
						
							
							
								 
						
							
							
								5d93c99e8c 
								
							
								 
							
						 
						
							
							
								
								Fix possible race condition with local region cache if a region was added after startup.  
							
							
							
						 
						
							2013-05-03 18:56:58 +01:00  
				
					
						
							
							
								 
						
							
							
								7ca42d5711 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-05-03 18:51:29 +01:00  
				
					
						
							
							
								 
						
							
							
								304c5d4a8b 
								
							
								 
							
						 
						
							
							
								
								On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created.  
							
							... 
							
							
							
							This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618  
							
						 
						
							2013-05-03 18:48:50 +01:00  
				
					
						
							
							
								 
						
							
							
								4042c82a72 
								
							
								 
							
						 
						
							
							
								
								BulletSim: prims with no cuts created with single convex hull shape.  
							
							... 
							
							
							
							Parameter added to enable/disable this feature. 
							
						 
						
							2013-05-02 12:27:30 -07:00  
				
					
						
							
							
								 
						
							
							
								d9c3947824 
								
							
								 
							
						 
						
							
							
								
								BulletSim: Rebuild physical body if physical shape changes for mesh and hull.  
							
							... 
							
							
							
							Properly rebuilds collision caches.
Release asset data fetched when building mesh or hulls. 
							
						 
						
							2013-05-02 10:06:12 -07:00  
				
					
						
							
							
								 
						
							
							
								a9480aed85 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bulletsim4  
							
							
							
						 
						
							2013-05-02 07:02:28 -07:00  
				
					
						
							
							
								 
						
							
							
								4cb73192a7 
								
							
								 
							
						 
						
							
							
								
								Make default config directory "."  
							
							
							
						 
						
							2013-05-01 23:01:33 -04:00  
				
					
						
							
							
								 
						
							
							
								ed46b42fea 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix crash when mesh asset wasn't available when meshing  
							
							... 
							
							
							
							the first time.
Debugging added for mesh/hull asset fetch. 
							
						 
						
							2013-05-01 17:16:46 -07:00  
				
					
						
							
							
								 
						
							
							
								0378baed35 
								
							
								 
							
						 
						
							
							
								
								BulletSim: rework LinksetCompound to work with new BSShape system.  
							
							... 
							
							
							
							Not all working yet. 
							
						 
						
							2013-05-01 17:15:54 -07:00  
				
					
						
							
							
								 
						
							
							
								04f76af22c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-05-01 18:52:15 -04:00  
				
					
						
							
							
								 
						
							
							
								e3d9d5566a 
								
							
								 
							
						 
						
							
							
								
								Fix inventory issue  
							
							... 
							
							
							
							Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory. 
							
						 
						
							2013-05-01 18:51:43 -04:00  
				
					
						
							
							
								 
						
							
							
								386d67ec61 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-05-01 23:02:06 +01:00  
				
					
						
							
							
								 
						
							
							
								854dcd1abd 
								
							
								 
							
						 
						
							
							
								
								Fix SmartThreadPool line endings in recent update from dos to unix  
							
							
							
						 
						
							2013-05-01 23:00:46 +01:00  
				
					
						
							
							
								 
						
							
							
								c6d50cd431 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2013-05-01 21:37:17 +01:00  
				
					
						
							
							
								 
						
							
							
								b26276c8c4 
								
							
								 
							
						 
						
							
							
								
								Fix the long standing bug of items being delivered to lost and found or trash when takig copy.  
							
							... 
							
							
							
							This bug was recently aggravated through the perms changes required for the
export permission. 
							
						 
						
							2013-05-01 21:35:50 +01:00  
				
					
						
							
							
								 
						
							
							
								fca4e4ec7c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into bulletsim4  
							
							
							
						 
						
							2013-05-01 12:08:12 -07:00  
				
					
						
							
							
								 
						
							
							
								81a90e30c6 
								
							
								 
							
						 
						
							
							
								
								Add in-code exaplanation for the change in cancellation signalling in STP 2.2.3.  Remove left in Console.WriteLine accidentally inserted in recent  206fb306 
							
							
							
						 
						
							2013-05-01 19:29:46 +01:00  
				
					
						
							
							
								 
						
							
							
								8d3250cee4 
								
							
								 
							
						 
						
							
							
								
								Add information about creating a PID file for robust to the Robust.ini and Robust.HG.ini example files  
							
							
							
						 
						
							2013-05-01 19:15:05 +01:00  
				
					
						
							
							
								 
						
							
							
								206fb306a7 
								
							
								 
							
						 
						
							
							
								
								Update SmartThreadPool to latest version 2.2.3 with a major and minor change.  
							
							... 
							
							
							
							SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool 
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557  and http://opensimulator.org/mantis/view.php?id=6586  
							
						 
						
							2013-05-01 19:01:43 +01:00  
				
					
						
							
							
								 
						
							
							
								ac135c649c 
								
							
								 
							
						 
						
							
							
								
								Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.  
							
							... 
							
							
							
							The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case. 
							
						 
						
							2013-04-30 23:50:23 +01:00  
				
					
						
							
							
								 
						
							
							
								46ae84cfba 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix error messages created while an avatar has no initial  
							
							... 
							
							
							
							collisions. Usually happens when logging in an avatar that had been
previously flying. Uninitialized variable. 
							
						 
						
							2013-04-30 13:10:15 -07:00  
				
					
						
							
							
								 
						
							
							
								7cdb07b386 
								
							
								 
							
						 
						
							
							
								
								BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working yet.  
							
							
							
						 
						
							2013-04-30 11:42:11 -07:00  
				
					
						
							
							
								 
						
							
							
								d322625f90 
								
							
								 
							
						 
						
							
							
								
								BulletSim: Add non-static BSShape.GetReference for getting another reference  
							
							... 
							
							
							
							to an existing shape instance.
BSShapeNative rebuilds shape for all references.
BSShapeCompound returns another reference copy if the compound shape
already exists (for linksets). 
							
						 
						
							2013-04-29 17:30:54 -07:00  
				
					
						
							
							
								 
						
							
							
								15a3f80e2e 
								
							
								 
							
						 
						
							
							
								
								BulletSim: LinksetCompound work to disable collision for root and  
							
							... 
							
							
							
							child prims so compound shape can do all collisions.
Don't try to build a compound linkset for non-physical linksets.
Remove and replace root body when compound shape is added so collision
cache is rebuilt. 
							
						 
						
							2013-04-29 17:30:38 -07:00  
				
					
						
							
							
								 
						
							
							
								3ce198165c 
								
							
								 
							
						 
						
							
							
								
								minor: remove some mono compiler warnings in ServicesServerBase  
							
							
							
						 
						
							2013-04-29 22:21:57 +01:00  
				
					
						
							
							
								 
						
							
							
								537b243360 
								
							
								 
							
						 
						
							
							
								
								minor: Eliminate warning in LLimageManagerTests by properly calling through to OpenSimTestCase.SetUp()  
							
							
							
						 
						
							2013-04-29 22:18:11 +01:00  
				
					
						
							
							
								 
						
							
							
								67789201c3 
								
							
								 
							
						 
						
							
							
								
								Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests  
							
							
							
						 
						
							2013-04-29 22:14:13 +01:00  
				
					
						
							
							
								 
						
							
							
								0beccf23c0 
								
							
								 
							
						 
						
							
							
								
								Add regression test for inventory item give, reject and subsequent trash folder purge by receiver.  
							
							... 
							
							
							
							This commit also actually adds the InventoryTransferModuleTests file which I previously forgot 
							
						 
						
							2013-04-29 21:11:44 +01:00  
				
					
						
							
							
								 
						
							
							
								a7cbb9edc9 
								
							
								 
							
						 
						
							
							
								
								Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message.  
							
							
							
						 
						
							2013-04-29 20:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								12054aaa9f 
								
							
								 
							
						 
						
							
							
								
								Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory  
							
							... 
							
							
							
							This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy. 
							
						 
						
							2013-04-29 17:14:44 +01:00  
				
					
						
							
							
								 
						
							
							
								92ee288d66 
								
							
								 
							
						 
						
							
							
								
								BulletSim: remove trailing white space to make git happier. No functional changes.  
							
							
							
						 
						
							2013-04-29 07:54:50 -07:00  
				
					
						
							
							
								 
						
							
							
								ad1787770e 
								
							
								 
							
						 
						
							
							
								
								BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_physicsScene' to match coding conventions and reduce confusion.  
							
							
							
						 
						
							2013-04-29 07:38:55 -07:00