Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
This commit is contained in:
Melanie
2012-01-28 04:05:53 +00:00
11 changed files with 130 additions and 29 deletions

View File

@@ -538,6 +538,12 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public UUID LastOwnerID
{
get { return m_rootPart.LastOwnerID; }
set { m_rootPart.LastOwnerID = value; }
}
public UUID OwnerID
{
get { return m_rootPart.OwnerID; }