30ab9647ba 
								
							
								 
							
						 
						
							
							
								
								TEST more changes  
							
							
							
						 
						
							2012-04-27 01:24:44 +01:00  
				
					
						
							
							
								 
						
							
							
								61e99fba87 
								
							
								 
							
						 
						
							
							
								
								TEST more options to avnLocalTeleport  
							
							
							
						 
						
							2012-04-27 01:18:30 +01:00  
				
					
						
							
							
								 
						
							
							
								2cf6023892 
								
							
								 
							
						 
						
							
							
								
								TEST  added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool Stopped) to scenepresence.cs  
							
							
							
						 
						
							2012-04-27 01:06:07 +01:00  
				
					
						
							
							
								 
						
							
							
								07e62df558 
								
							
								 
							
						 
						
							
							
								
								Add regression test for teleporting an agent between separated regions on the same simulator.  
							
							... 
							
							
							
							This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future. 
							
						 
						
							2012-04-27 00:58:54 +01:00  
				
					
						
							
							
								 
						
							
							
								8a65f5a70d 
								
							
								 
							
						 
						
							
							
								
								OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.  
							
							... 
							
							
							
							OSSL permissions are now controlled in OpenSim.ini. 
							
						 
						
							2012-04-26 22:53:13 +01:00  
				
					
						
							
							
								 
						
							
							
								0da8fe3124 
								
							
								 
							
						 
						
							
							
								
								Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.  
							
							
							
						 
						
							2012-04-26 22:49:14 +01:00  
				
					
						
							
							
								 
						
							
							
								ee13d817f1 
								
							
								 
							
						 
						
							
							
								
								When creating an OAR, objects where the user is the Creator are always included, regardless of their permissions.  
							
							... 
							
							
							
							The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created. 
							
						 
						
							2012-04-26 22:41:31 +01:00  
				
					
						
							
							
								 
						
							
							
								cb6791fb30 
								
							
								 
							
						 
						
							
							
								
								Tweak log messages on local region to region teleport path to help with problem resolution.  
							
							
							
						 
						
							2012-04-26 22:35:25 +01:00  
				
					
						
							
							
								 
						
							
							
								d19aa9e792 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-26 21:54:50 +01:00  
				
					
						
							
							
								 
						
							
							
								2542ca2a49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-26 16:40:36 -04:00  
				
					
						
							
							
								 
						
							
							
								fba802bb03 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of /home/opensim/var/repo/opensim  
							
							
							
						 
						
							2012-04-26 16:13:47 -04:00  
				
					
						
							
							
								 
						
							
							
								b8114d2b67 
								
							
								 
							
						 
						
							
							
								
								Add a version of osNpcSay that takes a channel number Mantis 5747  
							
							... 
							
							
							
							osNpcSay(UUID npc, string message) left untouched
New functions:-
osNpcSay(UUID npc, int channel, string message)
osNpcShout(UUID npc, int channel, string message)
osNpcWhisper(UUID npc, int channel, string message)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com> 
							
						 
						
							2012-04-26 16:13:29 -04:00  
				
					
						
							
							
								 
						
							
							
								fc576df273 
								
							
								 
							
						 
						
							
							
								
								revert last add commit  
							
							
							
						 
						
							2012-04-26 18:24:36 +01:00  
				
					
						
							
							
								 
						
							
							
								f194c48cd3 
								
							
								 
							
						 
						
							
							
								
								add wearable type PHYSICS  
							
							
							
						 
						
							2012-04-26 17:42:11 +01:00  
				
					
						
							
							
								 
						
							
							
								ca228c4770 
								
							
								 
							
						 
						
							
							
								
								Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity  
							
							
							
						 
						
							2012-04-26 16:20:53 +01:00  
				
					
						
							
							
								 
						
							
							
								fd19601c6b 
								
							
								 
							
						 
						
							
							
								
								Help big boobies to dance (avatar visualParams). May not persist and need more lobe ?  
							
							
							
						 
						
							2012-04-26 16:17:46 +01:00  
				
					
						
							
							
								 
						
							
							
								f49912f92a 
								
							
								 
							
						 
						
							
							
								
								minor: Add more detail to unauthorized caps client message  
							
							
							
						 
						
							2012-04-26 16:10:24 +01:00  
				
					
						
							
							
								 
						
							
							
								b0cbf16c19 
								
							
								 
							
						 
						
							
							
								
								minor: Add region name to dropped inbound packet message  
							
							
							
						 
						
							2012-04-26 16:04:49 +01:00  
				
					
						
							
							
								 
						
							
							
								4c4ffb9868 
								
							
								 
							
						 
						
							
							
								
								Add request verb and url to error messages in WebUtil that lack this.  
							
							... 
							
							
							
							Make exception printing consistent across windows and mono. 
							
						 
						
							2012-04-26 00:43:31 +01:00  
				
					
						
							
							
								 
						
							
							
								e52fe03fff 
								
							
								 
							
						 
						
							
							
								
								minor: Add avatar name to removing agent log message  
							
							
							
						 
						
							2012-04-26 00:42:37 +01:00  
				
					
						
							
							
								 
						
							
							
								74dbfe6bb5 
								
							
								 
							
						 
						
							
							
								
								Comment out avatar move to target message for now.  
							
							
							
						 
						
							2012-04-25 23:46:42 +01:00  
				
					
						
							
							
								 
						
							
							
								133370f158 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-25 11:57:29 -07:00  
				
					
						
							
							
								 
						
							
							
								a2d544c938 
								
							
								 
							
						 
						
							
							
								
								Add a configuration switch to turn on/off the use of the trash  
							
							... 
							
							
							
							folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).
Default is on (use the trash folder) which is the standard behavior. 
							
						 
						
							2012-04-25 11:54:57 -07:00  
				
					
						
							
							
								 
						
							
							
								db31c9fe58 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster  
							
							
							
						 
						
							2012-04-25 19:15:40 +01:00  
				
					
						
							
							
								 
						
							
							
								d676bc350d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-04-25 19:11:26 +01:00  
				
					
						
							
							
								 
						
							
							
								88553bb884 
								
							
								 
							
						 
						
							
							
								
								Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis  #5990  
							
							
							
						 
						
							2012-04-25 19:09:22 +01:00  
				
					
						
							
							
								 
						
							
							
								b62eee2f0b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2012-04-25 18:55:51 +01:00  
				
					
						
							
							
								 
						
							
							
								88c9fdfa3a 
								
							
								 
							
						 
						
							
							
								
								Adapt some TeleportWithMomentum calls  
							
							
							
						 
						
							2012-04-25 18:36:29 +01:00  
				
					
						
							
							
								 
						
							
							
								1afae01311 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-25 09:52:44 -07:00  
				
					
						
							
							
								 
						
							
							
								bec100a662 
								
							
								 
							
						 
						
							
							
								
								Add try/catch around Json script method registration to avoild some issues  
							
							... 
							
							
							
							with .NET 3.5 vs 4.0 differences.
See http://opensimulator.org/mantis/view.php?id=5971  
							
						 
						
							2012-04-25 09:51:30 -07:00  
				
					
						
							
							
								 
						
							
							
								22ea2ef9a0 
								
							
								 
							
						 
						
							
							
								
								set PIDHoverTau and not PIDTau since all physics need that  
							
							
							
						 
						
							2012-04-25 17:11:32 +01:00  
				
					
						
							
							
								 
						
							
							
								916e372382 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs 
							
						 
						
							2012-04-25 16:49:07 +01:00  
				
					
						
							
							
								 
						
							
							
								7aa25c6762 
								
							
								 
							
						 
						
							
							
								
								Slight rewording of output messages.  
							
							
							
						 
						
							2012-04-24 22:40:07 -07:00  
				
					
						
							
							
								 
						
							
							
								fd281ded3f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2012-04-24 22:17:52 -07:00  
				
					
						
							
							
								 
						
							
							
								cf1c34605b 
								
							
								 
							
						 
						
							
							
								
								HG: Moved User-level code down to the HGEntityTransferModule where it belongs.  
							
							
							
						 
						
							2012-04-24 22:17:10 -07:00  
				
					
						
							
							
								 
						
							
							
								550ff3b4da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2012-04-25 04:01:55 +01:00  
				
					
						
							
							
								 
						
							
							
								3be3189ee0 
								
							
								 
							
						 
						
							
							
								
								Commit the avination Teleport() methods (adaptedto justincc's changes)  
							
							
							
						 
						
							2012-04-25 04:00:01 +01:00  
				
					
						
							
							
								 
						
							
							
								af86e2939c 
								
							
								 
							
						 
						
							
							
								
								zero out SP velocity before calling SP.Teleport(), as the client expects (though this is also effectively done by physics at the moment)  
							
							
							
						 
						
							2012-04-25 03:47:26 +01:00  
				
					
						
							
							
								 
						
							
							
								9a23501824 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs 
							
						 
						
							2012-04-25 02:33:39 +01:00  
				
					
						
							
							
								 
						
							
							
								683cfc6f82 
								
							
								 
							
						 
						
							
							
								
								refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()  
							
							... 
							
							
							
							These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene. 
							
						 
						
							2012-04-25 02:07:55 +01:00  
				
					
						
							
							
								 
						
							
							
								a65ca24701 
								
							
								 
							
						 
						
							
							
								
								Add regression test TestSameRegionTeleport()  
							
							
							
						 
						
							2012-04-25 01:51:40 +01:00  
				
					
						
							
							
								 
						
							
							
								def65cd94a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs 
							
						 
						
							2012-04-25 01:22:09 +01:00  
				
					
						
							
							
								 
						
							
							
								f24289c47f 
								
							
								 
							
						 
						
							
							
								
								Comment out AvatarService.SetAvatar debug log line for now  
							
							
							
						 
						
							2012-04-25 01:09:23 +01:00  
				
					
						
							
							
								 
						
							
							
								6b299a4287 
								
							
								 
							
						 
						
							
							
								
								Comment out some debug ATTACHMENTS log messages for now.  
							
							
							
						 
						
							2012-04-25 00:52:33 +01:00  
				
					
						
							
							
								 
						
							
							
								39a6d7cab4 
								
							
								 
							
						 
						
							
							
								
								Comment out the noisier AVFACTORY log messages for now.  
							
							... 
							
							
							
							Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene. 
							
						 
						
							2012-04-25 00:47:32 +01:00  
				
					
						
							
							
								 
						
							
							
								0f470326aa 
								
							
								 
							
						 
						
							
							
								
								Improve teleport log debug and error messages to tell us who is teleporting.  
							
							
							
						 
						
							2012-04-25 00:19:38 +01:00  
				
					
						
							
							
								 
						
							
							
								3da613adf5 
								
							
								 
							
						 
						
							
							
								
								fix chODE loosing some part positions when doing isPhysical false  
							
							
							
						 
						
							2012-04-24 23:13:57 +01:00  
				
					
						
							
							
								 
						
							
							
								54d5ff6774 
								
							
								 
							
						 
						
							
							
								
								Go back to always using the local timezone for now - not all machines have US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control  
							
							... 
							
							
							
							Please see http://opensimulator.org/mantis/view.php?id=5972  soon for more comments. 
							
						 
						
							2012-04-24 23:00:50 +01:00  
				
					
						
							
							
								 
						
							
							
								816a44d6da 
								
							
								 
							
						 
						
							
							
								
								SOG bug fix in UI object  changes  
							
							
							
						 
						
							2012-04-24 21:48:12 +01:00  
				
					
						
							
							
								 
						
							
							
								ef1668adb3 
								
							
								 
							
						 
						
							
							
								
								Revert "Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type."  
							
							... 
							
							
							
							This reverts commit d3a4d67a20 
							
						 
						
							2012-04-24 21:42:32 +01:00