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.
This commit is contained in:
Melanie
2010-09-17 03:49:30 +01:00
36 changed files with 1052 additions and 1293 deletions

View File

@@ -335,7 +335,7 @@ namespace OpenSim.Data.SQLiteLegacy
lock (ds)
{
foreach (SceneObjectPart prim in obj.Children.Values)
foreach (SceneObjectPart prim in obj.Parts)
{
// m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
addPrim(prim, obj.UUID, regionUUID);