ad12b5df49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-04-29 02:23:54 +01:00  
				
					
						
							
							
								 
						
							
							
								c7c0d5558b 
								
							
								 
							
						 
						
							
							
								
								remove repeated set of group rotation to physics  
							
							
							
						 
						
							2012-04-29 01:00:46 +01:00  
				
					
						
							
							
								 
						
							
							
								df9935273f 
								
							
								 
							
						 
						
							
							
								
								SOG bug fix in group rotations updates  
							
							
							
						 
						
							2012-04-29 00:41:51 +01:00  
				
					
						
							
							
								 
						
							
							
								174fa4a70f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'avination'  
							
							
							
						 
						
							2012-04-29 01:33:40 +02:00  
				
					
						
							
							
								 
						
							
							
								dd745f60c2 
								
							
								 
							
						 
						
							
							
								
								fix llGetCenterOfMass  ( checked with ubitODE only)  
							
							
							
						 
						
							2012-04-28 21:36:38 +01:00  
				
					
						
							
							
								 
						
							
							
								8380166251 
								
							
								 
							
						 
						
							
							
								
								Comment out debug [ASYNC DELETER] messages for now.  
							
							
							
						 
						
							2012-04-28 00:39:40 +01:00  
				
					
						
							
							
								 
						
							
							
								cd755fe598 
								
							
								 
							
						 
						
							
							
								
								Remove mono compiler warning.  Adjust message log to error from info  
							
							
							
						 
						
							2012-04-28 00:31:11 +01:00  
				
					
						
							
							
								 
						
							
							
								133f05dc41 
								
							
								 
							
						 
						
							
							
								
								Add text about using double quotes to surround console command arguments containing spaces to "help" text.  
							
							... 
							
							
							
							e.g. show object name "My long object name" 
							
						 
						
							2012-04-28 00:29:08 +01:00  
				
					
						
							
							
								 
						
							
							
								2bad430ed8 
								
							
								 
							
						 
						
							
							
								
								Put scene object related console commands into new "Objects" help category rather than "Regions"  
							
							
							
						 
						
							2012-04-28 00:08:04 +01:00  
				
					
						
							
							
								 
						
							
							
								ab71779221 
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Implement bulk inventory update over CAPS (not recursive by design,""  
							
							... 
							
							
							
							This reverts commit a90b0e302c 
							
						 
						
							2012-04-27 23:54:45 +01:00  
				
					
						
							
							
								 
						
							
							
								737e177163 
								
							
								 
							
						 
						
							
							
								
								Revert "Log the full exception when errors occur in BaseHttpServer"  
							
							... 
							
							
							
							This reverts commit e31e7c68c8 
							
						 
						
							2012-04-27 23:46:46 +01:00  
				
					
						
							
							
								 
						
							
							
								a90b0e302c 
								
							
								 
							
						 
						
							
							
								
								Revert "Implement bulk inventory update over CAPS (not recursive by design,"  
							
							... 
							
							
							
							This reverts commit 6e7f13a72d 
							
						 
						
							2012-04-27 23:46:33 +01:00  
				
					
						
							
							
								 
						
							
							
								da29cbccfa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-27 23:39:13 +01:00  
				
					
						
							
							
								 
						
							
							
								d25469f66e 
								
							
								 
							
						 
						
							
							
								
								Add flags information (phantom, physics, etc.) to "show object" and "show part" console commands  
							
							
							
						 
						
							2012-04-27 23:38:25 +01:00  
				
					
						
							
							
								 
						
							
							
								e48fa38ff5 
								
							
								 
							
						 
						
							
							
								
								Oooops   don't hover underground but do hover  
							
							
							
						 
						
							2012-04-27 23:18:54 +01:00  
				
					
						
							
							
								 
						
							
							
								f5cb403e7e 
								
							
								 
							
						 
						
							
							
								
								reorder priority of vehicle hover flags  
							
							
							
						 
						
							2012-04-27 22:59:57 +01:00  
				
					
						
							
							
								 
						
							
							
								dcbcbd697f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs 
							
						 
						
							2012-04-27 22:28:09 +01:00  
				
					
						
							
							
								 
						
							
							
								e31e7c68c8 
								
							
								 
							
						 
						
							
							
								
								Log the full exception when errors occur in BaseHttpServer  
							
							
							
						 
						
							2012-04-27 21:52:04 +01:00  
				
					
						
							
							
								 
						
							
							
								db566fbb09 
								
							
								 
							
						 
						
							
							
								
								Fix prebuild.xml  
							
							... 
							
							
							
							adding a reference to a dll requires 'path="..."' 
							
						 
						
							2012-04-27 16:17:46 -04:00  
				
					
						
							
							
								 
						
							
							
								6473674bbf 
								
							
								 
							
						 
						
							
							
								
								Fixed: custom walking animations didn't stop when the avatar stopped walking.  
							
							... 
							
							
							
							This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK.
This reverts commit feef1dd732 
							
						 
						
							2012-04-27 20:47:02 +01:00  
				
					
						
							
							
								 
						
							
							
								9622e8ac72 
								
							
								 
							
						 
						
							
							
								
								If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region.  
							
							
							
						 
						
							2012-04-27 20:22:35 +01:00  
				
					
						
							
							
								 
						
							
							
								37d770f814 
								
							
								 
							
						 
						
							
							
								
								Use DotNetZip to compress OARs and IARs.  
							
							... 
							
							
							
							DotNetZip provides much better compression than standard .NET. 
							
						 
						
							2012-04-27 19:46:31 +01:00  
				
					
						
							
							
								 
						
							
							
								9d1791def8 
								
							
								 
							
						 
						
							
							
								
								Add Stefan_Boom / stoehr to contributors  
							
							
							
						 
						
							2012-04-27 19:42:12 +01:00  
				
					
						
							
							
								 
						
							
							
								e39e4f6bfb 
								
							
								 
							
						 
						
							
							
								
								minor: style adjustments in SensorRepeat, mainly related to patch from stoehr  
							
							
							
						 
						
							2012-04-27 19:40:19 +01:00  
				
					
						
							
							
								 
						
							
							
								b35a1d5681 
								
							
								 
							
						 
						
							
							
								
								Fixing wrong position of llSensor, SensePoint wasnt following the rotation of the root prim.  
							
							
							
						 
						
							2012-04-27 19:31:50 +01:00  
				
					
						
							
							
								 
						
							
							
								9bc94c502a 
								
							
								 
							
						 
						
							
							
								
								MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid  
							
							
							
						 
						
							2012-04-27 11:05:40 -07:00  
				
					
						
							
							
								 
						
							
							
								a9dbe39319 
								
							
								 
							
						 
						
							
							
								
								MapImage security issue. Compare strings instead of IPAddresses.  
							
							
							
						 
						
							2012-04-27 10:39:20 -07:00  
				
					
						
							
							
								 
						
							
							
								292752bb78 
								
							
								 
							
						 
						
							
							
								
								MapImage security issue: better error messages  
							
							
							
						 
						
							2012-04-27 10:22:43 -07:00  
				
					
						
							
							
								 
						
							
							
								ac64fe03d8 
								
							
								 
							
						 
						
							
							
								
								Amend to last commit: account for the existence of proxies.  
							
							
							
						 
						
							2012-04-27 09:59:46 -07:00  
				
					
						
							
							
								 
						
							
							
								2970a18e54 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-27 09:26:14 -07:00  
				
					
						
							
							
								 
						
							
							
								c84f63f4dc 
								
							
								 
							
						 
						
							
							
								
								Minor change in error message (HG teleport failures)  
							
							
							
						 
						
							2012-04-27 09:24:50 -07:00  
				
					
						
							
							
								 
						
							
							
								e4e754ee93 
								
							
								 
							
						 
						
							
							
								
								MapImageService: added an additional security check for OSGrid and other grids like it.  
							
							
							
						 
						
							2012-04-27 09:23:56 -07:00  
				
					
						
							
							
								 
						
							
							
								90305001de 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs 
							
						 
						
							2012-04-27 17:09:49 +01:00  
				
					
						
							
							
								 
						
							
							
								ee237fc5df 
								
							
								 
							
						 
						
							
							
								
								test  
							
							
							
						 
						
							2012-04-27 12:19:22 +01:00  
				
					
						
							
							
								 
						
							
							
								8ef7df5a56 
								
							
								 
							
						 
						
							
							
								
								test  
							
							
							
						 
						
							2012-04-27 11:01:34 +01:00  
				
					
						
							
							
								 
						
							
							
								2006188ee5 
								
							
								 
							
						 
						
							
							
								
								test  
							
							
							
						 
						
							2012-04-27 10:49:32 +01:00  
				
					
						
							
							
								 
						
							
							
								2419de2b6d 
								
							
								 
							
						 
						
							
							
								
								test  
							
							
							
						 
						
							2012-04-27 10:10:31 +01:00  
				
					
						
							
							
								 
						
							
							
								fedc9eb105 
								
							
								 
							
						 
						
							
							
								
								itest  
							
							
							
						 
						
							2012-04-27 09:50:53 +01:00  
				
					
						
							
							
								 
						
							
							
								1c735facee 
								
							
								 
							
						 
						
							
							
								
								test  
							
							
							
						 
						
							2012-04-27 09:23:20 +01:00  
				
					
						
							
							
								 
						
							
							
								cadbfcc011 
								
							
								 
							
						 
						
							
							
								
								itest  
							
							
							
						 
						
							2012-04-27 09:15:31 +01:00  
				
					
						
							
							
								 
						
							
							
								b948826b7e 
								
							
								 
							
						 
						
							
							
								
								test  
							
							
							
						 
						
							2012-04-27 09:09:29 +01:00  
				
					
						
							
							
								 
						
							
							
								7a7f4b7722 
								
							
								 
							
						 
						
							
							
								
								testing  
							
							
							
						 
						
							2012-04-27 09:00:30 +01:00  
				
					
						
							
							
								 
						
							
							
								03450dee39 
								
							
								 
							
						 
						
							
							
								
								testing....  
							
							
							
						 
						
							2012-04-27 08:11:18 +01:00  
				
					
						
							
							
								 
						
							
							
								6edbbdc83a 
								
							
								 
							
						 
						
							
							
								
								ubitODE fix  don't report colisions with a volume detector ( only report to it )  
							
							
							
						 
						
							2012-04-27 06:00:50 +01:00  
				
					
						
							
							
								 
						
							
							
								e974d493c6 
								
							
								 
							
						 
						
							
							
								
								testing  
							
							
							
						 
						
							2012-04-27 03:44:15 +01:00  
				
					
						
							
							
								 
						
							
							
								d8f691664a 
								
							
								 
							
						 
						
							
							
								
								testing  
							
							
							
						 
						
							2012-04-27 03:36:49 +01:00  
				
					
						
							
							
								 
						
							
							
								76d9040ed4 
								
							
								 
							
						 
						
							
							
								
								testing  
							
							
							
						 
						
							2012-04-27 02:54:39 +01:00  
				
					
						
							
							
								 
						
							
							
								911bc81b00 
								
							
								 
							
						 
						
							
							
								
								testing  
							
							
							
						 
						
							2012-04-27 02:13:54 +01:00  
				
					
						
							
							
								 
						
							
							
								a64a9e48de 
								
							
								 
							
						 
						
							
							
								
								TESTING  
							
							
							
						 
						
							2012-04-27 01:43:27 +01:00  
				
					
						
							
							
								 
						
							
							
								7397c9a68e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster  
							
							
							
						 
						
							2012-04-27 01:31:12 +01:00