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

* Changed 11 calls for session info to the more optimized API method

viewer-2-initial-appearance
John Hurliman 2010-09-08 15:08:49 -07:00
parent 3fb4a17f10
commit 5dc9ea2f24
4 changed files with 37 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,10 +348,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, new UUID(im.fromAgentID)); UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, new UUID(im.fromAgentID));
im.fromAgentName = account.FirstName + " " + account.LastName; im.fromAgentName = account.FirstName + " " + account.LastName;
PresenceInfo presence = null; PresenceInfo presence = PresenceService.GetAgent(new UUID(im.fromAgentID));
PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
if (presences != null && presences.Length > 0)
presence = presences[0];
if (presence != null) if (presence != null)
im.offline = 0; im.offline = 0;
@ -470,26 +467,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
return; return;
// The friend is not here [as root]. Let's forward. // The friend is not here [as root]. Let's forward.
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() }); PresenceInfo friendSession = PresenceService.GetAgent(friendID);
if (friendSessions != null && friendSessions.Length > 0) if (friendSession != null && friendSession.RegionID != UUID.Zero) // let's guard against sessions-gone-bad with the RegionID check
{ {
PresenceInfo friendSession = null; GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
foreach (PresenceInfo pinfo in friendSessions) //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
if (pinfo.RegionID != UUID.Zero) // let's guard against sessions-gone-bad m_FriendsSimConnector.StatusNotify(region, userID, friendID, online);
{
friendSession = pinfo;
break;
}
if (friendSession != null)
{
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
//m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
m_FriendsSimConnector.StatusNotify(region, userID, friendID, online);
}
} }
// Friend is not online. Ignore.
} }
else else
m_log.WarnFormat("[FRIENDS]: Error parsing friend ID {0}", friend.Friend); m_log.WarnFormat("[FRIENDS]: Error parsing friend ID {0}", friend.Friend);
@ -528,15 +512,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
return; return;
// The prospective friend is not here [as root]. Let's forward. // The prospective friend is not here [as root]. Let's forward.
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() }); PresenceInfo friendSession = PresenceService.GetAgent(friendID);
if (friendSessions != null && friendSessions.Length > 0) if (friendSession != null)
{ {
PresenceInfo friendSession = friendSessions[0]; GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
if (friendSession != null) m_FriendsSimConnector.FriendshipOffered(region, agentID, friendID, im.message);
{
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
m_FriendsSimConnector.FriendshipOffered(region, agentID, friendID, im.message);
}
} }
// If the prospective friend is not online, he'll get the message upon login. // If the prospective friend is not online, he'll get the message upon login.
} }
@ -563,16 +543,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
} }
// The friend is not here // The friend is not here
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() }); PresenceInfo friendSession = PresenceService.GetAgent(friendID);
if (friendSessions != null && friendSessions.Length > 0) if (friendSession != null)
{ {
PresenceInfo friendSession = friendSessions[0]; GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
if (friendSession != null) m_FriendsSimConnector.FriendshipApproved(region, agentID, client.Name, friendID);
{ client.SendAgentOnline(new UUID[] { friendID });
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
m_FriendsSimConnector.FriendshipApproved(region, agentID, client.Name, friendID);
client.SendAgentOnline(new UUID[] { friendID });
}
} }
} }
@ -591,18 +567,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (LocalFriendshipDenied(agentID, client.Name, friendID)) if (LocalFriendshipDenied(agentID, client.Name, friendID))
return; return;
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() }); PresenceInfo friendSession = PresenceService.GetAgent(friendID);
if (friendSessions != null && friendSessions.Length > 0) if (friendSession != null)
{ {
PresenceInfo friendSession = friendSessions[0]; GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
if (friendSession != null) if (region != null)
{ m_FriendsSimConnector.FriendshipDenied(region, agentID, client.Name, friendID);
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); else
if (region != null) m_log.WarnFormat("[FRIENDS]: Could not find region {0} in locating {1}", friendSession.RegionID, friendID);
m_FriendsSimConnector.FriendshipDenied(region, agentID, client.Name, friendID);
else
m_log.WarnFormat("[FRIENDS]: Could not find region {0} in locating {1}", friendSession.RegionID, friendID);
}
} }
} }
@ -624,15 +596,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (LocalFriendshipTerminated(exfriendID)) if (LocalFriendshipTerminated(exfriendID))
return; return;
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() }); PresenceInfo friendSession = PresenceService.GetAgent(exfriendID);
if (friendSessions != null && friendSessions.Length > 0) if (friendSession != null)
{ {
PresenceInfo friendSession = friendSessions[0]; GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
if (friendSession != null) m_FriendsSimConnector.FriendshipTerminated(region, agentID, exfriendID);
{
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
m_FriendsSimConnector.FriendshipTerminated(region, agentID, exfriendID);
}
} }
} }
@ -669,17 +637,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (LocalGrantRights(requester, target, myFlags, rights)) if (LocalGrantRights(requester, target, myFlags, rights))
return; return;
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { target.ToString() }); PresenceInfo friendSession = PresenceService.GetAgent(target);
if (friendSessions != null && friendSessions.Length > 0) if (friendSession != null)
{ {
PresenceInfo friendSession = friendSessions[0]; GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
if (friendSession != null) // TODO: You might want to send the delta to save the lookup
{ // on the other end!!
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); m_FriendsSimConnector.GrantRights(region, requester, target, myFlags, rights);
// TODO: You might want to send the delta to save the lookup
// on the other end!!
m_FriendsSimConnector.GrantRights(region, requester, target, myFlags, rights);
}
} }
} }
} }

4
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@ -498,9 +498,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (lookupAgent) if (lookupAgent)
{ {
// Non-cached user agent lookup. // Non-cached user agent lookup.
PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() }); upd = PresenceService.GetAgent(toAgentID);
if (presences != null && presences.Length > 0)
upd = presences[0];
if (upd != null) if (upd != null)
{ {

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -3971,9 +3971,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); pinfo = World.PresenceService.GetAgent(uuid);
if (pinfos != null && pinfos.Length > 0)
pinfo = pinfos[0];
ce = new UserInfoCacheEntry(); ce = new UserInfoCacheEntry();
ce.time = Util.EnvironmentTickCount(); ce.time = Util.EnvironmentTickCount();
@ -3991,11 +3989,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
{ {
PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); pinfo = World.PresenceService.GetAgent(uuid);
if (pinfos != null && pinfos.Length > 0)
pinfo = pinfos[0];
else
pinfo = null;
ce.time = Util.EnvironmentTickCount(); ce.time = Util.EnvironmentTickCount();
ce.pinfo = pinfo; ce.pinfo = pinfo;

4
OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
View File

@ -291,8 +291,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
// Check if the user is online // Check if the user is online
if (client.Scene is Scene) if (client.Scene is Scene)
{ {
OpenSim.Services.Interfaces.PresenceInfo[] presences = ((Scene)client.Scene).PresenceService.GetAgents(new string[] { avatarID.ToString() }); OpenSim.Services.Interfaces.PresenceInfo presence = ((Scene)client.Scene).PresenceService.GetAgent(avatarID);
if (presences != null && presences.Length > 0) if (presence != null)
flags |= ProfileFlags.Online; flags |= ProfileFlags.Online;
} }