aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorUbitUmarov2019-04-30 22:56:31 +0100
committerUbitUmarov2019-04-30 22:56:31 +0100
commite9587c88354964f7b1e5ca38e1b1f8b6da7ef9d4 (patch)
tree02e8e2e6c49b971d82680258cb781a1311292393 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentprimbasicshape: convert eventual MeshEP to SculpEP (diff)
downloadopensim-SC-e9587c88354964f7b1e5ca38e1b1f8b6da7ef9d4.zip
opensim-SC-e9587c88354964f7b1e5ca38e1b1f8b6da7ef9d4.tar.gz
opensim-SC-e9587c88354964f7b1e5ca38e1b1f8b6da7ef9d4.tar.bz2
opensim-SC-e9587c88354964f7b1e5ca38e1b1f8b6da7ef9d4.tar.xz
sop: rename a few fields
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs14
1 files changed, 7 insertions, 7 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();