OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

cpu-performance
Justin Clark-Casey (justincc) 2013-07-04 19:33:12 +01:00
parent 16f40c1a15 0cc0a2485c
commit c61becc62b
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/MySQL/Resources/FriendsStore.migrations
View File

@ -9,7 +9,7 @@ CREATE TABLE `Friends` (
`Offered` VARCHAR(32) NOT NULL DEFAULT 0, `Offered` VARCHAR(32) NOT NULL DEFAULT 0,
PRIMARY KEY(`PrincipalID`, `Friend`), PRIMARY KEY(`PrincipalID`, `Friend`),
KEY(`PrincipalID`) KEY(`PrincipalID`)
); ) ENGINE=InnoDB;
COMMIT; COMMIT;

7
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@ -526,8 +526,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (friendSession.RegionID != UUID.Zero) if (friendSession.RegionID != UUID.Zero)
{ {
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
//m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName); m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", (region == null ? "null" : region.RegionName));
m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online); if (region != null)
{
m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
}
} }
} }
} }

41
OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
View File

@ -348,31 +348,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
return null; return null;
} }
// public override FriendInfo[] GetFriendsFromService(IClientAPI client) public override FriendInfo[] GetFriendsFromService(IClientAPI client)
// { {
//// m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
// Boolean agentIsLocal = true; Boolean agentIsLocal = true;
// if (UserManagementModule != null) if (UserManagementModule != null)
// agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId); agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
// if (agentIsLocal) if (agentIsLocal)
// return base.GetFriendsFromService(client); return base.GetFriendsFromService(client);
// FriendInfo[] finfos = new FriendInfo[0]; FriendInfo[] finfos = new FriendInfo[0];
// // Foreigner // Foreigner
// AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode); AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
// if (agentClientCircuit != null) if (agentClientCircuit != null)
// { {
// //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit); // Note that this is calling a different interface than base; this one calls with a string param!
finfos = FriendsService.GetFriends(client.AgentId.ToString());
m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
}
// finfos = FriendsService.GetFriends(client.AgentId.ToString()); // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
// m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
// }
//// m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); return finfos;
}
// return finfos;
// }
protected override bool StoreRights(UUID agentID, UUID friendID, int rights) protected override bool StoreRights(UUID agentID, UUID friendID, int rights)
{ {