aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs50
2 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 0b38179..c0bafc5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -770,9 +770,9 @@ namespace OpenSim.Region.Framework.Scenes
770 } 770 }
771 771
772 if(av.IsNPC) 772 if(av.IsNPC)
773 av.crossingFlags = 0; 773 av.m_crossingFlags = 0;
774 else 774 else
775 av.crossingFlags = cflags; 775 av.m_crossingFlags = cflags;
776 776
777 av.PrevSitOffset = av.OffsetPosition; 777 av.PrevSitOffset = av.OffsetPosition;
778 av.ParentID = 0; 778 av.ParentID = 0;
@@ -821,7 +821,7 @@ namespace OpenSim.Region.Framework.Scenes
821 if(entityTransfer.CrossAgentCreateFarChild(av,destination, newpos, ctx)) 821 if(entityTransfer.CrossAgentCreateFarChild(av,destination, newpos, ctx))
822 crossedfar = true; 822 crossedfar = true;
823 else 823 else
824 av.crossingFlags = 0; 824 av.m_crossingFlags = 0;
825 } 825 }
826 826
827 if(crossedfar) 827 if(crossedfar)
@@ -834,7 +834,7 @@ namespace OpenSim.Region.Framework.Scenes
834 av.IsInTransit = true; 834 av.IsInTransit = true;
835 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val); 835 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val);
836 836
837 if(av.crossingFlags > 0) 837 if(av.m_crossingFlags > 0)
838 entityTransfer.CrossAgentToNewRegionAsync(av, newpos, destination, false, ctx); 838 entityTransfer.CrossAgentToNewRegionAsync(av, newpos, destination, false, ctx);
839 839
840 if (av.IsChildAgent) 840 if (av.IsChildAgent)
@@ -849,7 +849,7 @@ namespace OpenSim.Region.Framework.Scenes
849 av.ParentPart = null; 849 av.ParentPart = null;
850 // In any case 850 // In any case
851 av.IsInTransit = false; 851 av.IsInTransit = false;
852 av.crossingFlags = 0; 852 av.m_crossingFlags = 0;
853 m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", av.Firstname, av.Lastname); 853 m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", av.Firstname, av.Lastname);
854 } 854 }
855 else 855 else
@@ -865,7 +865,7 @@ namespace OpenSim.Region.Framework.Scenes
865 oldp.X = Util.Clamp<float>(oldp.X, 0.5f, sog.m_scene.RegionInfo.RegionSizeX - 0.5f); 865 oldp.X = Util.Clamp<float>(oldp.X, 0.5f, sog.m_scene.RegionInfo.RegionSizeX - 0.5f);
866 oldp.Y = Util.Clamp<float>(oldp.Y, 0.5f, sog.m_scene.RegionInfo.RegionSizeY - 0.5f); 866 oldp.Y = Util.Clamp<float>(oldp.Y, 0.5f, sog.m_scene.RegionInfo.RegionSizeY - 0.5f);
867 av.AbsolutePosition = oldp; 867 av.AbsolutePosition = oldp;
868 av.crossingFlags = 0; 868 av.m_crossingFlags = 0;
869 av.sitAnimation = "SIT"; 869 av.sitAnimation = "SIT";
870 av.IsInTransit = false; 870 av.IsInTransit = false;
871 if(av.Animator!= null) 871 if(av.Animator!= null)
@@ -926,7 +926,7 @@ namespace OpenSim.Region.Framework.Scenes
926 ScenePresence av = avinfo.av; 926 ScenePresence av = avinfo.av;
927 av.ParentUUID = UUID.Zero; 927 av.ParentUUID = UUID.Zero;
928 av.ParentID = avinfo.ParentID; 928 av.ParentID = avinfo.ParentID;
929 av.crossingFlags = 0; 929 av.m_crossingFlags = 0;
930 } 930 }
931 } 931 }
932 avsToCross.Clear(); 932 avsToCross.Clear();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c536184..b341d48 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -601,9 +601,9 @@ namespace OpenSim.Region.Framework.Scenes
601 public string Firstname { get; private set; } 601 public string Firstname { get; private set; }
602 public string Lastname { get; private set; } 602 public string Lastname { get; private set; }
603 603
604 public bool haveGroupInformation; 604 public bool m_haveGroupInformation;
605 public bool gotCrossUpdate; 605 public bool m_gotCrossUpdate;
606 public byte crossingFlags; 606 public byte m_crossingFlags;
607 607
608 public string Grouptitle 608 public string Grouptitle
609 { 609 {
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Framework.Scenes
1322 { 1322 {
1323 part.AddSittingAvatar(this); 1323 part.AddSittingAvatar(this);
1324 // if not actually on the target invalidate it 1324 // if not actually on the target invalidate it
1325 if(gotCrossUpdate && (crossingFlags & 0x04) == 0) 1325 if(m_gotCrossUpdate && (m_crossingFlags & 0x04) == 0)
1326 part.SitTargetAvatar = UUID.Zero; 1326 part.SitTargetAvatar = UUID.Zero;
1327 1327
1328 ParentID = part.LocalId; 1328 ParentID = part.LocalId;
@@ -1604,9 +1604,9 @@ namespace OpenSim.Region.Framework.Scenes
1604 public void MakeChildAgent(ulong newRegionHandle) 1604 public void MakeChildAgent(ulong newRegionHandle)
1605 { 1605 {
1606 m_updateAgentReceivedAfterTransferEvent.Reset(); 1606 m_updateAgentReceivedAfterTransferEvent.Reset();
1607 haveGroupInformation = false; 1607 m_haveGroupInformation = false;
1608 gotCrossUpdate = false; 1608 m_gotCrossUpdate = false;
1609 crossingFlags = 0; 1609 m_crossingFlags = 0;
1610 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd; 1610 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
1611 1611
1612 RegionHandle = newRegionHandle; 1612 RegionHandle = newRegionHandle;
@@ -2152,7 +2152,7 @@ namespace OpenSim.Region.Framework.Scenes
2152 2152
2153 if (!IsNPC) 2153 if (!IsNPC)
2154 { 2154 {
2155 if (!haveGroupInformation) 2155 if (!m_haveGroupInformation)
2156 { 2156 {
2157 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 2157 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
2158 if (gm != null) 2158 if (gm != null)
@@ -2171,9 +2171,9 @@ namespace OpenSim.Region.Framework.Scenes
2171 } 2171 }
2172 2172
2173 if (m_teleportFlags > 0) 2173 if (m_teleportFlags > 0)
2174 gotCrossUpdate = false; // sanity check 2174 m_gotCrossUpdate = false; // sanity check
2175 2175
2176 if (!gotCrossUpdate) 2176 if (!m_gotCrossUpdate)
2177 RotateToLookAt(look); 2177 RotateToLookAt(look);
2178 2178
2179 m_previusParcelHide = false; 2179 m_previusParcelHide = false;
@@ -2185,7 +2185,7 @@ namespace OpenSim.Region.Framework.Scenes
2185 m_inTransit = false; 2185 m_inTransit = false;
2186 2186
2187 // Tell the client that we're ready to send rest 2187 // Tell the client that we're ready to send rest
2188 if (!gotCrossUpdate) 2188 if (!m_gotCrossUpdate)
2189 { 2189 {
2190 m_gotRegionHandShake = false; // allow it if not a crossing 2190 m_gotRegionHandShake = false; // allow it if not a crossing
2191 ControllingClient.SendRegionHandshake(); 2191 ControllingClient.SendRegionHandshake();
@@ -2197,7 +2197,7 @@ namespace OpenSim.Region.Framework.Scenes
2197 2197
2198 if(!IsNPC) 2198 if(!IsNPC)
2199 { 2199 {
2200 if( ParentPart != null && (crossingFlags & 0x08) != 0) 2200 if( ParentPart != null && (m_crossingFlags & 0x08) != 0)
2201 { 2201 {
2202 ParentPart.ParentGroup.SendFullAnimUpdateToClient(ControllingClient); 2202 ParentPart.ParentGroup.SendFullAnimUpdateToClient(ControllingClient);
2203 } 2203 }
@@ -2221,13 +2221,13 @@ namespace OpenSim.Region.Framework.Scenes
2221 GodController.SyncViewerState(); 2221 GodController.SyncViewerState();
2222 2222
2223 // start sending terrain patchs 2223 // start sending terrain patchs
2224 if (!gotCrossUpdate) 2224 if (!m_gotCrossUpdate)
2225 Scene.SendLayerData(ControllingClient); 2225 Scene.SendLayerData(ControllingClient);
2226 2226
2227 // send initial land overlay and parcel 2227 // send initial land overlay and parcel
2228 ILandChannel landch = m_scene.LandChannel; 2228 ILandChannel landch = m_scene.LandChannel;
2229 if (landch != null) 2229 if (landch != null)
2230 landch.sendClientInitialLandInfo(client, !gotCrossUpdate); 2230 landch.sendClientInitialLandInfo(client, !m_gotCrossUpdate);
2231 } 2231 }
2232 2232
2233 List<ScenePresence> allpresences = m_scene.GetScenePresences(); 2233 List<ScenePresence> allpresences = m_scene.GetScenePresences();
@@ -2318,7 +2318,7 @@ namespace OpenSim.Region.Framework.Scenes
2318 2318
2319 if (!IsNPC) 2319 if (!IsNPC)
2320 { 2320 {
2321 if(gotCrossUpdate) 2321 if(m_gotCrossUpdate)
2322 { 2322 {
2323 SendOtherAgentsAvatarFullToMe(); 2323 SendOtherAgentsAvatarFullToMe();
2324 2324
@@ -2356,7 +2356,7 @@ namespace OpenSim.Region.Framework.Scenes
2356 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); 2356 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
2357 if (friendsModule != null) 2357 if (friendsModule != null)
2358 { 2358 {
2359 if(gotCrossUpdate) 2359 if(m_gotCrossUpdate)
2360 friendsModule.IsNowRoot(this); 2360 friendsModule.IsNowRoot(this);
2361 else 2361 else
2362 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 2362 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
@@ -2367,9 +2367,9 @@ namespace OpenSim.Region.Framework.Scenes
2367 } 2367 }
2368 finally 2368 finally
2369 { 2369 {
2370 haveGroupInformation = false; 2370 m_haveGroupInformation = false;
2371 gotCrossUpdate = false; 2371 m_gotCrossUpdate = false;
2372 crossingFlags = 0; 2372 m_crossingFlags = 0;
2373 m_inTransit = false; 2373 m_inTransit = false;
2374 } 2374 }
2375 2375
@@ -4910,7 +4910,7 @@ namespace OpenSim.Region.Framework.Scenes
4910 4910
4911 if(isCrossUpdate) 4911 if(isCrossUpdate)
4912 { 4912 {
4913 cAgent.CrossingFlags = crossingFlags; 4913 cAgent.CrossingFlags = m_crossingFlags;
4914 cAgent.CrossingFlags |= 1; 4914 cAgent.CrossingFlags |= 1;
4915 cAgent.CrossExtraFlags = 0; 4915 cAgent.CrossExtraFlags = 0;
4916 if((LastCommands & ScriptControlled.CONTROL_LBUTTON) != 0) 4916 if((LastCommands & ScriptControlled.CONTROL_LBUTTON) != 0)
@@ -5047,9 +5047,9 @@ namespace OpenSim.Region.Framework.Scenes
5047 if (cAgent.MotionState != 0) 5047 if (cAgent.MotionState != 0)
5048 Animator.currentControlState = (ScenePresenceAnimator.motionControlStates) cAgent.MotionState; 5048 Animator.currentControlState = (ScenePresenceAnimator.motionControlStates) cAgent.MotionState;
5049 5049
5050 crossingFlags = cAgent.CrossingFlags; 5050 m_crossingFlags = cAgent.CrossingFlags;
5051 gotCrossUpdate = (crossingFlags != 0); 5051 m_gotCrossUpdate = (m_crossingFlags != 0);
5052 if(gotCrossUpdate) 5052 if(m_gotCrossUpdate)
5053 { 5053 {
5054 LastCommands &= ~(ScriptControlled.CONTROL_LBUTTON | ScriptControlled.CONTROL_ML_LBUTTON); 5054 LastCommands &= ~(ScriptControlled.CONTROL_LBUTTON | ScriptControlled.CONTROL_ML_LBUTTON);
5055 if((cAgent.CrossExtraFlags & 1) != 0) 5055 if((cAgent.CrossExtraFlags & 1) != 0)
@@ -5059,11 +5059,11 @@ namespace OpenSim.Region.Framework.Scenes
5059 MouseDown = (cAgent.CrossExtraFlags & 3) != 0; 5059 MouseDown = (cAgent.CrossExtraFlags & 3) != 0;
5060 } 5060 }
5061 5061
5062 haveGroupInformation = false; 5062 m_haveGroupInformation = false;
5063 // using this as protocol detection don't want to mess with the numbers for now 5063 // using this as protocol detection don't want to mess with the numbers for now
5064 if(cAgent.ActiveGroupTitle != null) 5064 if(cAgent.ActiveGroupTitle != null)
5065 { 5065 {
5066 haveGroupInformation = true; 5066 m_haveGroupInformation = true;
5067 COF = cAgent.agentCOF; 5067 COF = cAgent.agentCOF;
5068 if(ControllingClient.IsGroupMember(cAgent.ActiveGroupID)) 5068 if(ControllingClient.IsGroupMember(cAgent.ActiveGroupID))
5069 { 5069 {