5c322335e5 
								
							
								 
							
						 
						
							
							
								
								add sqlite database back to database tests  
							
							... 
							
							
							
							this appears to be okay even though we reuse it between runs without deleting it first.
size of the database appears not to be changing though that could be deceptive 
							
						 
						
							2010-06-04 18:27:16 +01:00  
				
					
						
							
							
								 
						
							
							
								041f253e2b 
								
							
								 
							
						 
						
							
							
								
								minor: comment out region interface registration log msg I accidentally left in last week  
							
							... 
							
							
							
							also changes one log message to print out full exception stack trace on both mono/.net instead of just .net 
							
						 
						
							2010-06-04 18:08:40 +01:00  
				
					
						
							
							
								 
						
							
							
								8eb70f9719 
								
							
								 
							
						 
						
							
							
								
								Fix bug where prim items were not loaded in the new sqlite database handler  
							
							... 
							
							
							
							This addresses mantis http://opensimulator.org/mantis/view.php?id=4739  
							
						 
						
							2010-06-04 18:02:30 +01:00  
				
					
						
							
							
								 
						
							
							
								2f6d401db1 
								
							
								 
							
						 
						
							
							
								
								Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes  
							
							... 
							
							
							
							This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy
Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead.  Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs 
							
						 
						
							2010-06-04 18:00:48 +01:00  
				
					
						
							
							
								 
						
							
							
								55040a84a5 
								
							
								 
							
						 
						
							
							
								
								Fix bug where prim items were not loaded in the new sqlite database handler  
							
							... 
							
							
							
							This addresses mantis http://opensimulator.org/mantis/view.php?id=4739  
							
						 
						
							2010-06-04 17:14:12 +01:00  
				
					
						
							
							
								 
						
							
							
								dda7185b43 
								
							
								 
							
						 
						
							
							
								
								Change the admin kick message to something more generic, "OpenSim Manager" is not really accurate  
							
							
							
						 
						
							2010-06-03 17:55:50 -07:00  
				
					
						
							
							
								 
						
							
							
								82d0d1c092 
								
							
								 
							
						 
						
							
							
								
								Revert "Next OSG test. Don't remove app domains if they contain running threads."  
							
							... 
							
							
							
							This reverts commit f831a1778b 
							
						 
						
							2010-06-02 21:02:53 +01:00  
				
					
						
							
							
								 
						
							
							
								f831a1778b 
								
							
								 
							
						 
						
							
							
								
								Next OSG test. Don't remove app domains if they contain running threads.  
							
							
							
						 
						
							2010-06-02 19:57:03 +01:00  
				
					
						
							
							
								 
						
							
							
								20e6b7a320 
								
							
								 
							
						 
						
							
							
								
								Next OSG test. Cowardly refuse to save the state of badly behaved scripts, instead of forcing the issue.  
							
							
							
						 
						
							2010-06-02 18:05:58 +01:00  
				
					
						
							
							
								 
						
							
							
								c38f7c96e7 
								
							
								 
							
						 
						
							
							
								
								Revert "Next OSG TEST RELEASE. Join aborted threads."  
							
							... 
							
							
							
							This reverts commit 698066d7e3 
							
						 
						
							2010-06-02 18:00:44 +01:00  
				
					
						
							
							
								 
						
							
							
								698066d7e3 
								
							
								 
							
						 
						
							
							
								
								Next OSG TEST RELEASE. Join aborted threads.  
							
							
							
						 
						
							2010-06-02 17:41:28 +01:00  
				
					
						
							
							
								 
						
							
							
								c5cfae7bac 
								
							
								 
							
						 
						
							
							
								
								Revert "After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG"  
							
							... 
							
							
							
							This reverts commit 241ed5734e 
							
						 
						
							2010-06-02 17:39:58 +01:00  
				
					
						
							
							
								 
						
							
							
								241ed5734e 
								
							
								 
							
						 
						
							
							
								
								After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG  
							
							... 
							
							
							
							testing. DO NOT UPDATE TO THIS UNLESS YOU KNOW WHAT YOU'RE DOING! 
							
						 
						
							2010-06-02 17:14:37 +01:00  
				
					
						
							
							
								 
						
							
							
								293f775fa5 
								
							
								 
							
						 
						
							
							
								
								Always provide at least 2 packets of a texture (if the texture is larger than 1 packet). This fixes compatibility with the newer (broken) SnowGlobe and Emerald viewer(s), but also matches the behaviour of SL.  
							
							
							
						 
						
							2010-06-02 07:59:18 -07:00  
				
					
						
							
							
								 
						
							
							
								b198763d67 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2010-06-02 01:22:10 +01:00  
				
					
						
							
							
								 
						
							
							
								aa5a346a68 
								
							
								 
							
						 
						
							
							
								
								Add a forgotten security check. Make the new functions only work on prims  
							
							... 
							
							
							
							owned by the host prim owner. 
							
						 
						
							2010-06-02 01:21:55 +01:00  
				
					
						
							
							
								 
						
							
							
								53e96dccef 
								
							
								 
							
						 
						
							
							
								
								Add two new osFunctions:  
							
							... 
							
							
							
							list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules); 
							
						 
						
							2010-06-02 01:21:50 +01:00  
				
					
						
							
							
								 
						
							
							
								655f02b695 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor  
							
							
							
						 
						
							2010-06-02 01:05:36 +02:00  
				
					
						
							
							
								 
						
							
							
								70aa965c26 
								
							
								 
							
						 
						
							
							
								
								Add a forgotten security check. Make the new functions only work on prims  
							
							... 
							
							
							
							owned by the host prim owner. 
							
						 
						
							2010-06-02 01:04:17 +02:00  
				
					
						
							
							
								 
						
							
							
								d8962ef415 
								
							
								 
							
						 
						
							
							
								
								Add two new osFunctions:  
							
							... 
							
							
							
							list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules); 
							
						 
						
							2010-06-02 01:01:56 +02:00  
				
					
						
							
							
								 
						
							
							
								d740035ef4 
								
							
								 
							
						 
						
							
							
								
								Applying patch from coyled to fix IAR support with the SimianGrid connectors  
							
							
							
						 
						
							2010-06-01 13:32:14 -07:00  
				
					
						
							
							
								 
						
							
							
								90c814a7ca 
								
							
								 
							
						 
						
							
							
								
								Fix nullref in cmGetAvatarList() (ported from 0.69)  
							
							
							
						 
						
							2010-06-01 13:29:12 -07:00  
				
					
						
							
							
								 
						
							
							
								0209033dd9 
								
							
								 
							
						 
						
							
							
								
								Gosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks.  
							
							
							
						 
						
							2010-06-01 13:22:24 -07:00  
				
					
						
							
							
								 
						
							
							
								a863eb9da3 
								
							
								 
							
						 
						
							
							
								
								One should not lock null objects.  
							
							
							
						 
						
							2010-06-01 19:01:57 +01:00  
				
					
						
							
							
								 
						
							
							
								6668c789d3 
								
							
								 
							
						 
						
							
							
								
								One should not lock null objects.  
							
							
							
						 
						
							2010-06-01 19:01:21 +02:00  
				
					
						
							
							
								 
						
							
							
								9c3c020697 
								
							
								 
							
						 
						
							
							
								
								Lock the object queue when dequeueing  
							
							
							
						 
						
							2010-06-01 15:08:45 +01:00  
				
					
						
							
							
								 
						
							
							
								c900134f91 
								
							
								 
							
						 
						
							
							
								
								Lock the object queue when dequeueing  
							
							
							
						 
						
							2010-06-01 16:03:53 +02:00  
				
					
						
							
							
								 
						
							
							
								5270e54268 
								
							
								 
							
						 
						
							
							
								
								Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the  
							
							... 
							
							
							
							needed libraries 
							
						 
						
							2010-06-01 14:20:39 +01:00  
				
					
						
							
							
								 
						
							
							
								f5ca701273 
								
							
								 
							
						 
						
							
							
								
								Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the  
							
							... 
							
							
							
							needed libraries 
							
						 
						
							2010-06-01 14:19:26 +01:00  
				
					
						
							
							
								 
						
							
							
								f8e2d25739 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster-presence-refactor  
							
							
							
						 
						
							2010-06-01 02:24:12 +01:00  
				
					
						
							
							
								 
						
							
							
								28c5759456 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor  
							
							
							
						 
						
							2010-06-01 03:18:03 +02:00  
				
					
						
							
							
								 
						
							
							
								16d8602d3c 
								
							
								 
							
						 
						
							
							
								
								Fix prim returns I broke earlier  
							
							
							
						 
						
							2010-06-01 03:17:21 +02:00  
				
					
						
							
							
								 
						
							
							
								4867dd135d 
								
							
								 
							
						 
						
							
							
								
								Fix prim returns I broke earlier  
							
							
							
						 
						
							2010-06-01 02:12:56 +01:00  
				
					
						
							
							
								 
						
							
							
								a5728cc91c 
								
							
								 
							
						 
						
							
							
								
								Fix prim returns I broke earlier  
							
							
							
						 
						
							2010-06-01 02:10:53 +01:00  
				
					
						
							
							
								 
						
							
							
								f29cb57bf1 
								
							
								 
							
						 
						
							
							
								
								Continuing refactor. Refactor DeRezObject to deal with multiple objects  
							
							
							
						 
						
							2010-06-01 02:10:22 +01:00  
				
					
						
							
							
								 
						
							
							
								bde01e26e1 
								
							
								 
							
						 
						
							
							
								
								Add a method to get the bounding box and root prim offsets within it for  
							
							... 
							
							
							
							a group of prims. 
							
						 
						
							2010-06-01 02:10:11 +01:00  
				
					
						
							
							
								 
						
							
							
								2fce7d9bcf 
								
							
								 
							
						 
						
							
							
								
								Split GetAxisAlignedBoundingBox into two methods to allow calculation of  
							
							... 
							
							
							
							combined bounding boxes and offsets 
							
						 
						
							2010-06-01 02:10:08 +01:00  
				
					
						
							
							
								 
						
							
							
								6c4c72546c 
								
							
								 
							
						 
						
							
							
								
								Fix prim returns I broke earlier  
							
							
							
						 
						
							2010-06-01 03:05:08 +02:00  
				
					
						
							
							
								 
						
							
							
								eca15cfbf2 
								
							
								 
							
						 
						
							
							
								
								Change the handling of CreateSelected. Only send it on real creation, not  
							
							... 
							
							
							
							for each prim coming into view. 
							
						 
						
							2010-06-01 02:45:14 +02:00  
				
					
						
							
							
								 
						
							
							
								be69259981 
								
							
								 
							
						 
						
							
							
								
								Change the handling of CreateSelected. Only send it on real creation, not  
							
							... 
							
							
							
							for each prim coming into view. 
							
						 
						
							2010-06-01 01:39:54 +01:00  
				
					
						
							
							
								 
						
							
							
								bf233ea0dc 
								
							
								 
							
						 
						
							
							
								
								Continuing refactor. Refactor DeRezObject to deal with multiple objects  
							
							
							
						 
						
							2010-06-01 02:27:30 +02:00  
				
					
						
							
							
								 
						
							
							
								f57f2370f1 
								
							
								 
							
						 
						
							
							
								
								Add a method to get the bounding box and root prim offsets within it for  
							
							... 
							
							
							
							a group of prims. 
							
						 
						
							2010-06-01 01:25:24 +02:00  
				
					
						
							
							
								 
						
							
							
								70f7790413 
								
							
								 
							
						 
						
							
							
								
								Split GetAxisAlignedBoundingBox into two methods to allow calculation of  
							
							... 
							
							
							
							combined bounding boxes and offsets 
							
						 
						
							2010-06-01 01:07:46 +02:00  
				
					
						
							
							
								 
						
							
							
								9d4913224f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor  
							
							
							
						 
						
							2010-05-31 19:00:36 +02:00  
				
					
						
							
							
								 
						
							
							
								d4b4cbf5a5 
								
							
								 
							
						 
						
							
							
								
								Fix create selection getting overwritten by multiple updates for the same prim.  
							
							
							
						 
						
							2010-05-31 19:00:02 +02:00  
				
					
						
							
							
								 
						
							
							
								0526a91206 
								
							
								 
							
						 
						
							
							
								
								Merge branch '0.6.9-post-fixes' into careminster  
							
							
							
						 
						
							2010-05-31 17:57:48 +01:00  
				
					
						
							
							
								 
						
							
							
								e515467c5e 
								
							
								 
							
						 
						
							
							
								
								Fix create selection getting overwritten by multiple updates for the same prim.  
							
							
							
						 
						
							2010-05-31 17:55:56 +01:00  
				
					
						
							
							
								 
						
							
							
								4be13b1a42 
								
							
								 
							
						 
						
							
							
								
								Fix casting in llParcelMediaCommandList so that it actually, you know, works  
							
							
							
						 
						
							2010-05-31 08:41:00 -07:00  
				
					
						
							
							
								 
						
							
							
								6c1665bf46 
								
							
								 
							
						 
						
							
							
								
								Fix casting in llParcelMediaCommandList so that it actually, you know, works  
							
							
							
						 
						
							2010-05-31 08:38:41 -07:00  
				
					
						
							
							
								 
						
							
							
								bbb4d6e4c9 
								
							
								 
							
						 
						
							
							
								
								Fix a nullref in EventManager caused by RegionReady not setting the scene  
							
							
							
						 
						
							2010-05-31 01:02:04 +02:00