Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-11-23 14:05:09 +00:00
11 changed files with 252 additions and 82 deletions

View File

@@ -117,7 +117,7 @@ namespace OpenSim.Framework
}
protected UUID m_creatorIdAsUuid = UUID.Zero;
protected string m_creatorData;
protected string m_creatorData = string.Empty;
public string CreatorData // = <profile url>;<name>
{
get { return m_creatorData; }