aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-04-30 23:01:37 +0100
committerUbitUmarov2019-04-30 23:01:37 +0100
commit3491af440f7d4852415f574b06356bec3006c0c8 (patch)
tree7417f51eb447fa7483fe96e51b75c6abdcad5204
parentsop: rename a few fields (diff)
downloadopensim-SC-3491af440f7d4852415f574b06356bec3006c0c8.zip
opensim-SC-3491af440f7d4852415f574b06356bec3006c0c8.tar.gz
opensim-SC-3491af440f7d4852415f574b06356bec3006c0c8.tar.bz2
opensim-SC-3491af440f7d4852415f574b06356bec3006c0c8.tar.xz
missing files...
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs2
5 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 772485c..39bf46c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
256 256
257 private void OnMakeRootAgent(ScenePresence sp) 257 private void OnMakeRootAgent(ScenePresence sp)
258 { 258 {
259 if(sp.gotCrossUpdate) 259 if(sp.m_gotCrossUpdate)
260 return; 260 return;
261 261
262 RecacheFriends(sp.ControllingClient); 262 RecacheFriends(sp.ControllingClient);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index a2c2aa7..187df31 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1874,7 +1874,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1874 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); 1874 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
1875 1875
1876 Vector3 vel2 = Vector3.Zero; 1876 Vector3 vel2 = Vector3.Zero;
1877 if((agent.crossingFlags & 2) != 0) 1877 if((agent.m_crossingFlags & 2) != 0)
1878 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0); 1878 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
1879 1879
1880 if (m_eqModule != null) 1880 if (m_eqModule != null)
@@ -1900,10 +1900,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1900 if(childRegionsToClose != null) 1900 if(childRegionsToClose != null)
1901 agent.CloseChildAgents(childRegionsToClose); 1901 agent.CloseChildAgents(childRegionsToClose);
1902 1902
1903 if((agent.crossingFlags & 8) == 0) 1903 if((agent.m_crossingFlags & 8) == 0)
1904 agent.ClearControls(); // don't let attachments delete (called in HasMovedAway) disturb taken controls on viewers 1904 agent.ClearControls(); // don't let attachments delete (called in HasMovedAway) disturb taken controls on viewers
1905 1905
1906 agent.HasMovedAway((agent.crossingFlags & 8) == 0); 1906 agent.HasMovedAway((agent.m_crossingFlags & 8) == 0);
1907 1907
1908 agent.MakeChildAgent(neighbourRegion.RegionHandle); 1908 agent.MakeChildAgent(neighbourRegion.RegionHandle);
1909 1909
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index 1529fc2..615ae78 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
68 if (sp.IsNPC) 68 if (sp.IsNPC)
69 return; 69 return;
70 70
71 if(sp.gotCrossUpdate) 71 if(sp.m_gotCrossUpdate)
72 { 72 {
73 Util.FireAndForget(delegate 73 Util.FireAndForget(delegate
74 { 74 {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 3f418f6..6f4eace 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
71 71
72 sp.ControllingClient.OnConnectionClosed += OnConnectionClose; 72 sp.ControllingClient.OnConnectionClosed += OnConnectionClose;
73 73
74 if (sp.gotCrossUpdate) 74 if (sp.m_gotCrossUpdate)
75 { 75 {
76 Util.FireAndForget(delegate 76 Util.FireAndForget(delegate
77 { 77 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 65d50bb..4b81838 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -278,7 +278,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
278 // There might be some problem with the thread we're generating this on but not 278 // There might be some problem with the thread we're generating this on but not
279 // doing the update at this time causes problems (Mantis #7920 and #7915) 279 // doing the update at this time causes problems (Mantis #7920 and #7915)
280 // TODO: move sending this update to a later time in the rootification of the client. 280 // TODO: move sending this update to a later time in the rootification of the client.
281 if(!sp.haveGroupInformation) 281 if(!sp.m_haveGroupInformation)
282 SendAgentGroupDataUpdate(sp.ControllingClient, false); 282 SendAgentGroupDataUpdate(sp.ControllingClient, false);
283 } 283 }
284 284