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

missing files...

0.9.1.0-post-fixes
UbitUmarov 2019-04-30 23:01:37 +01:00
parent e9587c8835
commit 3491af440f
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
private void OnMakeRootAgent(ScenePresence sp) private void OnMakeRootAgent(ScenePresence sp)
{ {
if(sp.gotCrossUpdate) if(sp.m_gotCrossUpdate)
return; return;
RecacheFriends(sp.ControllingClient); RecacheFriends(sp.ControllingClient);

6
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1874,7 +1874,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
Vector3 vel2 = Vector3.Zero; Vector3 vel2 = Vector3.Zero;
if((agent.crossingFlags & 2) != 0) if((agent.m_crossingFlags & 2) != 0)
vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0); vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
if (m_eqModule != null) if (m_eqModule != null)
@ -1900,10 +1900,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if(childRegionsToClose != null) if(childRegionsToClose != null)
agent.CloseChildAgents(childRegionsToClose); agent.CloseChildAgents(childRegionsToClose);
if((agent.crossingFlags & 8) == 0) if((agent.m_crossingFlags & 8) == 0)
agent.ClearControls(); // don't let attachments delete (called in HasMovedAway) disturb taken controls on viewers agent.ClearControls(); // don't let attachments delete (called in HasMovedAway) disturb taken controls on viewers
agent.HasMovedAway((agent.crossingFlags & 8) == 0); agent.HasMovedAway((agent.m_crossingFlags & 8) == 0);
agent.MakeChildAgent(neighbourRegion.RegionHandle); agent.MakeChildAgent(neighbourRegion.RegionHandle);

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
if (sp.IsNPC) if (sp.IsNPC)
return; return;
if(sp.gotCrossUpdate) if(sp.m_gotCrossUpdate)
{ {
Util.FireAndForget(delegate Util.FireAndForget(delegate
{ {

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
View File

@ -71,7 +71,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
sp.ControllingClient.OnConnectionClosed += OnConnectionClose; sp.ControllingClient.OnConnectionClosed += OnConnectionClose;
if (sp.gotCrossUpdate) if (sp.m_gotCrossUpdate)
{ {
Util.FireAndForget(delegate Util.FireAndForget(delegate
{ {

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -278,7 +278,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// There might be some problem with the thread we're generating this on but not // There might be some problem with the thread we're generating this on but not
// doing the update at this time causes problems (Mantis #7920 and #7915) // doing the update at this time causes problems (Mantis #7920 and #7915)
// TODO: move sending this update to a later time in the rootification of the client. // TODO: move sending this update to a later time in the rootification of the client.
if(!sp.haveGroupInformation) if(!sp.m_haveGroupInformation)
SendAgentGroupDataUpdate(sp.ControllingClient, false); SendAgentGroupDataUpdate(sp.ControllingClient, false);
} }