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

Don't request group information in SP.MakeRootAgent() if the presence belongs to no group (UUID.Zero) 

This was trigger the XmlRpcGroups errors described in http://opensimulator.org/mantis/view.php?id=6986
Introduced in commit 5b73b9c4 (Wed Dec 11 01:39:56 2013)
0.8.0.3
Justin Clark-Casey (justincc) 2014-02-14 23:43:07 +00:00
parent 733e067958
commit 4fed301e65
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1057,30 +1057,32 @@ namespace OpenSim.Region.Framework.Scenes
m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
UUID groupUUID = UUID.Zero; UUID groupUUID = ControllingClient.ActiveGroupId;
string GroupName = string.Empty; string groupName = string.Empty;
ulong groupPowers = 0; ulong groupPowers = 0;
// ---------------------------------- // ----------------------------------
// Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
try try
{ {
if (gm != null) if (groupUUID != UUID.Zero && gm != null)
{ {
groupUUID = ControllingClient.ActiveGroupId;
GroupRecord record = gm.GetGroupRecord(groupUUID); GroupRecord record = gm.GetGroupRecord(groupUUID);
if (record != null) if (record != null)
GroupName = record.GroupName; groupName = record.GroupName;
GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid); GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
if (groupMembershipData != null) if (groupMembershipData != null)
groupPowers = groupMembershipData.GroupPowers; groupPowers = groupMembershipData.GroupPowers;
} }
ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
Grouptitle); ControllingClient.SendAgentDataUpdate(
m_uuid, groupUUID, Firstname, Lastname, groupPowers, groupName, Grouptitle);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Debug("[AGENTUPDATE]: " + e.ToString()); m_log.Error("[AGENTUPDATE]: Error ", e);
} }
// ------------------------------------ // ------------------------------------