Merge branch 'master' into careminster-presence-refactor

Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -144,7 +144,7 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     MySqlCommand cmd = dbcon.CreateCommand();
 
-                    foreach (SceneObjectPart prim in obj.Children.Values)
+                    foreach (SceneObjectPart prim in obj.Parts)
                     {
                         cmd.Parameters.Clear();