Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-07 00:44:36 +01:00
9 changed files with 252 additions and 142 deletions

View File

@@ -268,7 +268,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (m_Friends.ContainsKey(agentID))
{
if (m_Friends[agentID].RegionID == UUID.Zero && m_Friends[agentID].Friends == null)
if (m_Friends[agentID].RegionID == UUID.Zero)
{
m_Friends[agentID].Friends =
m_FriendsService.GetFriends(agentID);