Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-19 11:47:50 +01:00
82 changed files with 389 additions and 4362 deletions

View File

@@ -2218,7 +2218,7 @@ namespace OpenSim.Region.Framework.Scenes
if (root == null)
{
m_log.DebugFormat("[LINK]: Can't find linkset root prim {0{", parentPrimId);
m_log.DebugFormat("[LINK]: Can't find linkset root prim {0}", parentPrimId);
return;
}