2b76dba593 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Physics/OdePlugin/OdePlugin.cs 
							
						 
						
							2010-06-19 09:02:36 -07:00  
				
					
						
							
							
								 
						
							
							
								f0f684161e 
								
							
								 
							
						 
						
							
							
								
								Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis  #4777  
							
							
							
						 
						
							2010-06-19 08:57:58 -07:00  
				
					
						
							
							
								 
						
							
							
								db046f1fba 
								
							
								 
							
						 
						
							
							
								
								Reinstated the behavior of AddPrimShape as it was as of December. Trying to fix mantis  #4777  
							
							
							
						 
						
							2010-06-19 08:51:07 -07:00  
				
					
						
							
							
								 
						
							
							
								954906f0bd 
								
							
								 
							
						 
						
							
							
								
								remove link to wiki mysql-config since the page was out-of-date and actively misleading  
							
							
							
						 
						
							2010-06-19 01:52:13 +01:00  
				
					
						
							
							
								 
						
							
							
								ad62ca6bab 
								
							
								 
							
						 
						
							
							
								
								minor: correct a spelling mistake  
							
							
							
						 
						
							2010-06-19 01:27:46 +01:00  
				
					
						
							
							
								 
						
							
							
								8fc3745e19 
								
							
								 
							
						 
						
							
							
								
								Overhaul basic README.txt for new estate setup options on first run.  
							
							... 
							
							
							
							Also make some minor changes for clarity. 
							
						 
						
							2010-06-19 01:23:52 +01:00  
				
					
						
							
							
								 
						
							
							
								514732595b 
								
							
								 
							
						 
						
							
							
								
								minor: try and make the explanations for the AllowScriptCrossing and TrustBinaries settings in OpenSim.ini.example clearer  
							
							
							
						 
						
							2010-06-18 23:38:40 +01:00  
				
					
						
							
							
								 
						
							
							
								de84da9e7b 
								
							
								 
							
						 
						
							
							
								
								eliminate SimianGrid [Groups] section from GridCommon.ini.example as per Nebadon  
							
							... 
							
							
							
							this is only used by SimianGrid and is now in SimianGrid.ini 
							
						 
						
							2010-06-18 23:20:32 +01:00  
				
					
						
							
							
								 
						
							
							
								ed01e9162d 
								
							
								 
							
						 
						
							
							
								
								Change Opensim.Servers.exe comment at top of Robust.HG.ini to Robust.exe  
							
							... 
							
							
							
							This addresses http://opensimulator.org/mantis/view.php?id=4772 
Thanks to aiaustin for pointing this out 
							
						 
						
							2010-06-18 23:11:31 +01:00  
				
					
						
							
							
								 
						
							
							
								71a73d83cb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2010-06-18 19:50:01 +01:00  
				
					
						
							
							
								 
						
							
							
								47d5f90629 
								
							
								 
							
						 
						
							
							
								
								Remove an error in meshing error reporting. Now doesn't double-bomb  
							
							... 
							
							
							
							anymore on a bad sculpt 
							
						 
						
							2010-06-18 19:49:14 +01:00  
				
					
						
							
							
								 
						
							
							
								71c8bbaf2c 
								
							
								 
							
						 
						
							
							
								
								Fix problem where iar load would duplicate huge number of folders  
							
							... 
							
							
							
							This was http://opensimulator.org/mantis/view.php?id=4770 
Extend unit tests to check for this scenario too 
							
						 
						
							2010-06-18 17:37:28 +01:00  
				
					
						
							
							
								 
						
							
							
								11a35d8cda 
								
							
								 
							
						 
						
							
							
								
								change TestPartExistingIarPath() to check appropriate folder creation  
							
							... 
							
							
							
							change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable 
							
						 
						
							2010-06-18 17:10:16 +01:00  
				
					
						
							
							
								 
						
							
							
								cf4721a92d 
								
							
								 
							
						 
						
							
							
								
								in IAR utils, return all folders that match a particular path rather than just the first one  
							
							
							
						 
						
							2010-06-18 16:33:34 +01:00  
				
					
						
							
							
								 
						
							
							
								e3432b8f63 
								
							
								 
							
						 
						
							
							
								
								Revert "Set command timeout to infinity on migrations"  
							
							... 
							
							
							
							This reverts commit 51d30fd34a 
							
						 
						
							2010-06-17 17:48:34 +01:00  
				
					
						
							
							
								 
						
							
							
								51d30fd34a 
								
							
								 
							
						 
						
							
							
								
								Set command timeout to infinity on migrations  
							
							
							
						 
						
							2010-06-17 17:43:40 +01:00  
				
					
						
							
							
								 
						
							
							
								544627c79c 
								
							
								 
							
						 
						
							
							
								
								Force newly connecting remote consoles to display a prompt  
							
							
							
						 
						
							2010-06-17 03:03:55 +01:00  
				
					
						
							
							
								 
						
							
							
								6c0a372346 
								
							
								 
							
						 
						
							
							
								
								* Support salted and unsalted password hashes in SimianAuthenticationServiceConnector  
							
							
							
						 
						
							2010-06-15 17:46:36 -07:00  
				
					
						
							
							
								 
						
							
							
								38f098588c 
								
							
								 
							
						 
						
							
							
								
								Fixes creation date issue on user accounts.  
							
							
							
						 
						
							2010-06-15 16:36:22 -07:00  
				
					
						
							
							
								 
						
							
							
								07b8eddb64 
								
							
								 
							
						 
						
							
							
								
								Typo corrected in Robust.HG.ini.example  
							
							
							
						 
						
							2010-06-14 19:11:49 -07:00  
				
					
						
							
							
								 
						
							
							
								0ecb45066d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2010-06-15 01:53:32 +01:00  
				
					
						
							
							
								 
						
							
							
								0031d4a618 
								
							
								 
							
						 
						
							
							
								
								Readjust master version and flavor  
							
							
							
						 
						
							2010-06-15 01:53:11 +01:00  
				
					
						
							
							
								 
						
							
							
								6dd3f2b8b8 
								
							
								 
							
						 
						
							
							
								
								Readusr master version and flavor  
							
							
							
						 
						
							2010-06-15 01:52:37 +01:00  
				
					
						
							
							
								 
						
							
							
								462a0f24e9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into 0.7-post-fixes  
							
							
							
						 
						
							2010-06-14 11:54:40 -07:00  
				
					
						
							
							
								 
						
							
							
								9c9ce9e8dd 
								
							
								 
							
						 
						
							
							
								
								* Deleted duplicated migration that was failing anyway.  
							
							... 
							
							
							
							* Added an error message in initial estate owner creation that makes it clear what needs to happen. 
							
						 
						
							2010-06-14 11:50:42 -07:00  
				
					
						
							
							
								 
						
							
							
								53c32d8773 
								
							
								 
							
						 
						
							
							
								
								osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.  
							
							
							
						 
						
							2010-06-14 12:09:35 +01:00  
				
					
						
							
							
								 
						
							
							
								c75b94f9f9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into 0.7-post-fixes  
							
							
							
						 
						
							2010-06-14 04:50:27 +01:00  
				
					
						
							
							
								 
						
							
							
								bd346ab8c7 
								
							
								 
							
						 
						
							
							
								
								Fixes attachments coming back upon being detached in neighbouring regions and crossing.  
							
							
							
						 
						
							2010-06-13 19:18:17 -07:00  
				
					
						
							
							
								 
						
							
							
								19558f380a 
								
							
								 
							
						 
						
							
							
								
								Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.  
							
							
							
						 
						
							2010-06-13 19:06:22 -07:00  
				
					
						
							
							
								 
						
							
							
								9069114d0f 
								
							
								 
							
						 
						
							
							
								
								Fox my changes to radmin  
							
							
							
						 
						
							2010-06-13 21:57:56 +01:00  
				
					
						
							
							
								 
						
							
							
								14c587bea1 
								
							
								 
							
						 
						
							
							
								
								Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following  
							
							... 
							
							
							
							changes:
- Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it
- Adjusted comments to remove misleading or no longer true comments. Default
is neuter, according to the code, not male, as the comment stated. 
							
						 
						
							2010-06-13 21:45:39 +01:00  
				
					
						
							
							
								 
						
							
							
								deaf6bff98 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into 0.7-post-fixes  
							
							
							
						 
						
							2010-06-13 03:56:47 +01:00  
				
					
						
							
							
								 
						
							
							
								eff641ab83 
								
							
								 
							
						 
						
							
							
								
								Added Old Guids=true to all MySql connection strings.  
							
							
							
						 
						
							2010-06-12 17:08:05 -07:00  
				
					
						
							
							
								 
						
							
							
								b3594681a4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-06-12 12:09:06 -07:00  
				
					
						
							
							
								 
						
							
							
								66619b5996 
								
							
								 
							
						 
						
							
							
								
								Added checks for failed UpdateAgent calls.  
							
							
							
						 
						
							2010-06-12 12:08:45 -07:00  
				
					
						
							
							
								 
						
							
							
								59acb37d92 
								
							
								 
							
						 
						
							
							
								
								Change name of method to better reflect what it does  
							
							
							
						 
						
							2010-06-12 19:14:46 +01:00  
				
					
						
							
							
								 
						
							
							
								b9c01a1c42 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-06-12 11:11:48 -07:00  
				
					
						
							
							
								 
						
							
							
								e6efe34b4c 
								
							
								 
							
						 
						
							
							
								
								* Added CHANGED_TELEPORT event trigger upon inter-sim teleports.  
							
							... 
							
							
							
							* Cleaned up NewUserConnection. 
							
						 
						
							2010-06-12 11:11:13 -07:00  
				
					
						
							
							
								 
						
							
							
								ceac35bac1 
								
							
								 
							
						 
						
							
							
								
								Log and eat sculpt meshing exceptions caused by bad jp2 data.  
							
							
							
						 
						
							2010-06-12 16:25:40 +01:00  
				
					
						
							
							
								 
						
							
							
								3c036934a3 
								
							
								 
							
						 
						
							
							
								
								Preserving the link numbers is a serializer's highest duty.  
							
							... 
							
							
							
							Prevent region crossings from screwing up complex attachments by preserving
link numbers. 
							
						 
						
							2010-06-12 08:28:00 +01:00  
				
					
						
							
							
								 
						
							
							
								4c58ac2c90 
								
							
								 
							
						 
						
							
							
								
								Make local teleports send CHANGED_TELEPORT  
							
							
							
						 
						
							2010-06-12 07:35:03 +01:00  
				
					
						
							
							
								 
						
							
							
								65f03af38f 
								
							
								 
							
						 
						
							
							
								
								Don't filre CHANGED_INVENTORY if a prim comes in from storage  
							
							
							
						 
						
							2010-06-12 07:34:55 +01:00  
				
					
						
							
							
								 
						
							
							
								92fea025cb 
								
							
								 
							
						 
						
							
							
								
								Resume scripts that  have been rezzed from a prim  
							
							
							
						 
						
							2010-06-12 06:13:27 +01:00  
				
					
						
							
							
								 
						
							
							
								85d2e21558 
								
							
								 
							
						 
						
							
							
								
								Change trunk versio to 0.7.1 Dev  
							
							
							
						 
						
							2010-06-12 02:45:21 +01:00  
				
					
						
							
							
								 
						
							
							
								99f2a1c347 
								
							
								 
							
						 
						
							
							
								
								* Tweak the StopFlying() method in LLClientView to fabricate a suitable landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f  
							
							
							
						 
						
							2010-06-11 21:46:01 -04:00  
				
					
						
							
							
								 
						
							
							
								4dd9cf1ce4 
								
							
								 
							
						 
						
							
							
								
								Change flavor to 0.7-RC1  
							
							
							
						 
						
							2010-06-12 02:44:01 +01:00  
				
					
						
							
							
								 
						
							
							
								c8ed972443 
								
							
								 
							
						 
						
							
							
								
								Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet  
							
							... 
							
							
							
							we used to send before slimupdates and explicitly send it 
							
						 
						
							2010-06-12 01:25:25 +01:00  
				
					
						
							
							
								 
						
							
							
								ed38b4a140 
								
							
								 
							
						 
						
							
							
								
								Some people don't use Simian. Make the connector respect that it's disabled  
							
							... 
							
							
							
							and not try to send a map tile in that case. 
							
						 
						
							2010-06-12 00:32:54 +01:00  
				
					
						
							
							
								 
						
							
							
								b5bc2816fc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-06-11 15:43:22 -07:00  
				
					
						
							
							
								 
						
							
							
								d1a324888b 
								
							
								 
							
						 
						
							
							
								
								* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed  
							
							... 
							
							
							
							* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API 
							
						 
						
							2010-06-11 15:37:25 -07:00