d99c60164d 
								
							
								 
							
						 
						
							
							
								
								Reinstate kill record check that prevents an entity update being sent to a client after it has been told that the entity has been deleted.  
							
							... 
							
							
							
							On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog.
This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted. 
							
						 
						
							2010-08-26 16:06:34 +01:00  
				
					
						
							
							
								 
						
							
							
								a6869fbc3e 
								
							
								 
							
						 
						
							
							
								
								Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()  
							
							... 
							
							
							
							By the time a scheduled update is triggered, a sog may have been removed from the scene.  This change prevents NullReferenceExceptions in these situations. 
							
						 
						
							2010-08-26 15:33:42 +01:00  
				
					
						
							
							
								 
						
							
							
								87a6554d4b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							... 
							
							
							
							Resolve merge conflicts
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs 
							
						 
						
							2010-08-26 00:35:03 +01:00  
				
					
						
							
							
								 
						
							
							
								692cf3c657 
								
							
								 
							
						 
						
							
							
								
								Remove parts locking from data classes since these are using a copy of the scene object  
							
							
							
						 
						
							2010-08-26 00:17:26 +01:00  
				
					
						
							
							
								 
						
							
							
								166ab59420 
								
							
								 
							
						 
						
							
							
								
								replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway)  
							
							
							
						 
						
							2010-08-26 00:15:26 +01:00  
				
					
						
							
							
								 
						
							
							
								8031f8ec09 
								
							
								 
							
						 
						
							
							
								
								Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking  
							
							
							
						 
						
							2010-08-26 00:08:53 +01:00  
				
					
						
							
							
								 
						
							
							
								75e2a2b3ce 
								
							
								 
							
						 
						
							
							
								
								Prevent an object disposed exception that made forms comms unreliable. After  
							
							... 
							
							
							
							starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief. 
							
						 
						
							2010-08-25 23:19:55 +01:00  
				
					
						
							
							
								 
						
							
							
								604423d52b 
								
							
								 
							
						 
						
							
							
								
								Make scene object directories more robust and prevent deleted SOP's from  
							
							... 
							
							
							
							sticking around 
							
						 
						
							2010-08-25 23:19:30 +01:00  
				
					
						
							
							
								 
						
							
							
								739eb14741 
								
							
								 
							
						 
						
							
							
								
								Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry  
							
							... 
							
							
							
							any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless. 
							
						 
						
							2010-08-25 23:18:15 +01:00  
				
					
						
							
							
								 
						
							
							
								22fd00b002 
								
							
								 
							
						 
						
							
							
								
								minor: remove mono compiler warning  
							
							
							
						 
						
							2010-08-25 23:07:43 +01:00  
				
					
						
							
							
								 
						
							
							
								24d06b12c2 
								
							
								 
							
						 
						
							
							
								
								If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID  
							
							... 
							
							
							
							Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed 
							
						 
						
							2010-08-25 23:05:54 +01:00  
				
					
						
							
							
								 
						
							
							
								46c6c35d48 
								
							
								 
							
						 
						
							
							
								
								refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory  
							
							
							
						 
						
							2010-08-25 22:46:49 +01:00  
				
					
						
							
							
								 
						
							
							
								a2113ecc71 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2010-08-24 21:01:37 -07:00  
				
					
						
							
							
								 
						
							
							
								d69e992665 
								
							
								 
							
						 
						
							
							
								
								Split out actual scene object insertion code from Scene.Inventory.RezObject and move into SceneGraph.AddNewSceneObject()  
							
							... 
							
							
							
							The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages.
This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module
This code does not touch direct rez by a user 
							
						 
						
							2010-08-24 23:25:19 +01:00  
				
					
						
							
							
								 
						
							
							
								78f452050a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-08-24 22:29:32 +01:00  
				
					
						
							
							
								 
						
							
							
								07d5a0779a 
								
							
								 
							
						 
						
							
							
								
								refactor: make RezObject() more readable  
							
							
							
						 
						
							2010-08-24 20:53:25 +01:00  
				
					
						
							
							
								 
						
							
							
								a7a45cb22c 
								
							
								 
							
						 
						
							
							
								
								Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attachments.  
							
							... 
							
							
							
							This fixes Mantis #3923 .
Signed-off-by: Melanie <melanie@t-data.com> 
							
						 
						
							2010-08-24 19:19:26 +01:00  
				
					
						
							
							
								 
						
							
							
								46d06b6c4c 
								
							
								 
							
						 
						
							
							
								
								add test to check move of task item to user inventory when a target folder is explicitly given  
							
							
							
						 
						
							2010-08-24 17:10:52 +01:00  
				
					
						
							
							
								 
						
							
							
								8bb073d99a 
								
							
								 
							
						 
						
							
							
								
								minor: stop test using obsolete property  
							
							
							
						 
						
							2010-08-24 17:06:04 +01:00  
				
					
						
							
							
								 
						
							
							
								35f719ae2f 
								
							
								 
							
						 
						
							
							
								
								refactor TestMoveTaskInventoryItemNoParent()  
							
							
							
						 
						
							2010-08-24 17:04:54 +01:00  
				
					
						
							
							
								 
						
							
							
								289c21099c 
								
							
								 
							
						 
						
							
							
								
								Add automated test at the opensim 'api' level to check that a given item goes to the correct directory  
							
							... 
							
							
							
							Also removes some mono compiler warnings 
							
						 
						
							2010-08-24 16:50:31 +01:00  
				
					
						
							
							
								 
						
							
							
								de85aabcbe 
								
							
								 
							
						 
						
							
							
								
								Plumb the region type through to the ProductName field in estate messages  
							
							
							
						 
						
							2010-08-24 12:41:21 +01:00  
				
					
						
							
							
								 
						
							
							
								c72d298202 
								
							
								 
							
						 
						
							
							
								
								Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem.  
							
							
							
						 
						
							2010-08-23 23:25:36 +01:00  
				
					
						
							
							
								 
						
							
							
								1d01c91095 
								
							
								 
							
						 
						
							
							
								
								minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs  
							
							
							
						 
						
							2010-08-23 23:21:44 +01:00  
				
					
						
							
							
								 
						
							
							
								704a53fb9b 
								
							
								 
							
						 
						
							
							
								
								Fix bug in llGiveInventory() where items were disappearing on relog  
							
							... 
							
							
							
							This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a 
							
						 
						
							2010-08-23 23:16:48 +01:00  
				
					
						
							
							
								 
						
							
							
								74e5fe5aa9 
								
							
								 
							
						 
						
							
							
								
								Remove various warnings and improve logging messages.  No functional changes.  
							
							
							
						 
						
							2010-08-23 22:24:23 +01:00  
				
					
						
							
							
								 
						
							
							
								8d8436e0ca 
								
							
								 
							
						 
						
							
							
								
								Correct a minor typo  
							
							
							
						 
						
							2010-08-21 20:59:25 +01:00  
				
					
						
							
							
								 
						
							
							
								f445659dd3 
								
							
								 
							
						 
						
							
							
								
								Finally putting estate_settings.xml to rest. There will be no more attempts  
							
							... 
							
							
							
							to read or write this file. 
							
						 
						
							2010-08-21 17:38:47 +01:00  
				
					
						
							
							
								 
						
							
							
								954329ec85 
								
							
								 
							
						 
						
							
							
								
								Don't allow oversized search reply packets  
							
							
							
						 
						
							2010-08-21 17:30:41 +01:00  
				
					
						
							
							
								 
						
							
							
								ea1df09fa4 
								
							
								 
							
						 
						
							
							
								
								Forward-port a small improvement to the land out connector  
							
							
							
						 
						
							2010-08-21 00:29:27 +01:00  
				
					
						
							
							
								 
						
							
							
								5155915de1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-08-20 19:36:04 +01:00  
				
					
						
							
							
								 
						
							
							
								7aad5af498 
								
							
								 
							
						 
						
							
							
								
								Some code cleanup for console command "create region".  
							
							... 
							
							
							
							Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text. 
							
						 
						
							2010-08-20 19:35:52 +01:00  
				
					
						
							
							
								 
						
							
							
								e31a5260c8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-08-20 11:10:21 -07:00  
				
					
						
							
							
								 
						
							
							
								4463ebfbc2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-08-20 11:09:21 -07:00  
				
					
						
							
							
								 
						
							
							
								f347d25675 
								
							
								 
							
						 
						
							
							
								
								Unit test breakage fix.  
							
							
							
						 
						
							2010-08-20 11:09:02 -07:00  
				
					
						
							
							
								 
						
							
							
								c41ff51bd3 
								
							
								 
							
						 
						
							
							
								
								OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section away from end and correction of typo "fro" (fixes Mantis 4833)  
							
							
							
						 
						
							2010-08-20 19:08:26 +01:00  
				
					
						
							
							
								 
						
							
							
								a87840bd1c 
								
							
								 
							
						 
						
							
							
								
								Make some small corrections to ini.example file changes.  These are not functional changes.  
							
							
							
						 
						
							2010-08-20 18:25:44 +01:00  
				
					
						
							
							
								 
						
							
							
								2c0ba8718a 
								
							
								 
							
						 
						
							
							
								
								Robust.ini.example and Robust.HG.ini.example default: corrected comment about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case  
							
							
							
						 
						
							2010-08-20 18:03:21 +01:00  
				
					
						
							
							
								 
						
							
							
								86a61696d7 
								
							
								 
							
						 
						
							
							
								
								minor: remove mono compiler warning  
							
							
							
						 
						
							2010-08-20 17:58:02 +01:00  
				
					
						
							
							
								 
						
							
							
								bb5dd9fbbc 
								
							
								 
							
						 
						
							
							
								
								Some code cleanup for console command alert.  
							
							... 
							
							
							
							Made parsing of parameters more robust.
Allow general alerts without specifying keyword 'general'.
Extended help texts. 
							
						 
						
							2010-08-20 17:53:21 +01:00  
				
					
						
							
							
								 
						
							
							
								6f83b0ee46 
								
							
								 
							
						 
						
							
							
								
								Cleaned up a few more things related to incoming agents.  
							
							
							
						 
						
							2010-08-20 09:02:05 -07:00  
				
					
						
							
							
								 
						
							
							
								82abaadd55 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2010-08-20 08:36:54 +01:00  
				
					
						
							
							
								 
						
							
							
								ae554a48d0 
								
							
								 
							
						 
						
							
							
								
								Add some maptile options, change maptile generation from OpenSimBase to Scene  
							
							... 
							
							
							
							to make it more configurable. 
							
						 
						
							2010-08-20 08:36:23 +01:00  
				
					
						
							
							
								 
						
							
							
								b4e7c62fbc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2010-08-19 19:55:03 -07:00  
				
					
						
							
							
								 
						
							
							
								a39ea07158 
								
							
								 
							
						 
						
							
							
								
								Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.  
							
							
							
						 
						
							2010-08-19 19:54:40 -07:00  
				
					
						
							
							
								 
						
							
							
								1955b79759 
								
							
								 
							
						 
						
							
							
								
								Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.  
							
							
							
						 
						
							2010-08-19 18:55:30 -07:00  
				
					
						
							
							
								 
						
							
							
								f639a9e5ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2010-08-19 20:24:46 +01:00  
				
					
						
							
							
								 
						
							
							
								22fdd7b1f1 
								
							
								 
							
						 
						
							
							
								
								Short-circuit the grid server lookup for RequestSimulatorData if the region  
							
							... 
							
							
							
							info is requested for is the local region 
							
						 
						
							2010-08-19 20:24:34 +01:00  
				
					
						
							
							
								 
						
							
							
								31365e3ec4 
								
							
								 
							
						 
						
							
							
								
								These files want to be committed. This time I'm doing it separately from other commits.  
							
							
							
						 
						
							2010-08-19 09:17:08 -07:00  
				
					
						
							
							
								 
						
							
							
								2b172bef72 
								
							
								 
							
						 
						
							
							
								
								Revert "One more go at GetExternalIpOf(user). Addresses mantis  #4955  and #4943."  
							
							... 
							
							
							
							Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.
This reverts commit e47608fc62 
							
						 
						
							2010-08-19 09:14:20 -07:00