Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-04-29 23:33:26 +01:00
18 changed files with 884 additions and 150 deletions

View File

@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (m_FriendsService == null)
{
m_log.Error("[FRIENDS]: No Connector defined in section Friends, or filed to load, cannot continue");
m_log.Error("[FRIENDS]: No Connector defined in section Friends, or failed to load, cannot continue");
throw new Exception("Connector load error");
}