Merge branch 'master' into careminster-presence-refactor

Also prevent god takes from ending up in Lost and Found
This commit is contained in:
Melanie
2010-12-03 02:36:13 +00:00
45 changed files with 1185 additions and 548 deletions

View File

@@ -459,7 +459,10 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public string CreatorData // = <profile url>;<name>
/// <summary>
/// Data about the creator in the form profile_url;name
/// </summary>
public string CreatorData
{
get { return m_creatorData; }
set { m_creatorData = value; }