diff options
author | Jeff Ames | 2008-03-18 15:30:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-18 15:30:38 +0000 |
commit | e5b91442822df211f9f8277aaf0c40e1339810f3 (patch) | |
tree | 116ac977981e7bea0b7dd4c8f9cbad87e02c5b65 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | * Applying Mantis Patch #518.2 - State not persisted in MySQL DataStore (diff) | |
download | opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.zip opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.tar.gz opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.tar.bz2 opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 120 |
1 files changed, 59 insertions, 61 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index b00b678..050bf95 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -115,12 +115,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
115 | 115 | ||
116 | protected AvatarAppearance m_appearance; | 116 | protected AvatarAppearance m_appearance; |
117 | 117 | ||
118 | //neighbouring regions we have enabled a child agent in | ||
118 | private readonly List<ulong> m_knownChildRegions = new List<ulong>(); | 119 | private readonly List<ulong> m_knownChildRegions = new List<ulong>(); |
119 | //neighbouring regions we have enabled a child agent in | ||
120 | 120 | ||
121 | private SignificantClientMovement handlerSignificantClientMovement = null; //OnSignificantClientMovement; | 121 | private SignificantClientMovement handlerSignificantClientMovement = null; //OnSignificantClientMovement; |
122 | 122 | ||
123 | |||
124 | /// <summary> | 123 | /// <summary> |
125 | /// Implemented Control Flags | 124 | /// Implemented Control Flags |
126 | /// </summary> | 125 | /// </summary> |
@@ -1447,12 +1446,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1447 | m_perfMonMS=System.Environment.TickCount; | 1446 | m_perfMonMS=System.Environment.TickCount; |
1448 | 1447 | ||
1449 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 1448 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
1449 | { | ||
1450 | if (scenePresence.UUID != UUID) | ||
1450 | { | 1451 | { |
1451 | if (scenePresence.UUID != UUID) | 1452 | m_appearance.SendAppearanceToOtherAgent(scenePresence); |
1452 | { | 1453 | } |
1453 | m_appearance.SendAppearanceToOtherAgent(scenePresence); | 1454 | }); |
1454 | } | ||
1455 | }); | ||
1456 | m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); | 1455 | m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); |
1457 | } | 1456 | } |
1458 | 1457 | ||
@@ -1780,9 +1779,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1780 | } | 1779 | } |
1781 | 1780 | ||
1782 | [SecurityPermission(SecurityAction.LinkDemand, | 1781 | [SecurityPermission(SecurityAction.LinkDemand, |
1783 | Flags = SecurityPermissionFlag.SerializationFormatter)] | 1782 | Flags = SecurityPermissionFlag.SerializationFormatter)] |
1784 | public virtual void GetObjectData( | 1783 | public virtual void GetObjectData( |
1785 | SerializationInfo info, StreamingContext context) | 1784 | SerializationInfo info, StreamingContext context) |
1786 | { | 1785 | { |
1787 | if (info == null) | 1786 | if (info == null) |
1788 | { | 1787 | { |
@@ -1792,7 +1791,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1792 | info.AddValue("FullID", FullID.UUID); | 1791 | info.AddValue("FullID", FullID.UUID); |
1793 | info.AddValue("LastFullUpdateTime", LastFullUpdateTime); | 1792 | info.AddValue("LastFullUpdateTime", LastFullUpdateTime); |
1794 | info.AddValue("LastTerseUpdateTime", LastTerseUpdateTime); | 1793 | info.AddValue("LastTerseUpdateTime", LastTerseUpdateTime); |
1795 | |||
1796 | } | 1794 | } |
1797 | } | 1795 | } |
1798 | 1796 | ||
@@ -1929,9 +1927,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1929 | 1927 | ||
1930 | m_requestedSitOffset | 1928 | m_requestedSitOffset |
1931 | = new LLVector3( | 1929 | = new LLVector3( |
1932 | (float)info.GetValue("m_requestedSitOffset.X", typeof(float)), | 1930 | (float)info.GetValue("m_requestedSitOffset.X", typeof(float)), |
1933 | (float)info.GetValue("m_requestedSitOffset.Y", typeof(float)), | 1931 | (float)info.GetValue("m_requestedSitOffset.Y", typeof(float)), |
1934 | (float)info.GetValue("m_requestedSitOffset.Z", typeof(float))); | 1932 | (float)info.GetValue("m_requestedSitOffset.Z", typeof(float))); |
1935 | 1933 | ||
1936 | m_sitAvatarHeight = (float)info.GetValue("m_sitAvatarHeight", typeof(float)); | 1934 | m_sitAvatarHeight = (float)info.GetValue("m_sitAvatarHeight", typeof(float)); |
1937 | m_godlevel = (float)info.GetValue("m_godlevel", typeof(float)); | 1935 | m_godlevel = (float)info.GetValue("m_godlevel", typeof(float)); |
@@ -1939,10 +1937,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1939 | 1937 | ||
1940 | m_bodyRot | 1938 | m_bodyRot |
1941 | = new Quaternion( | 1939 | = new Quaternion( |
1942 | (float)info.GetValue("m_bodyRot.w", typeof(float)), | 1940 | (float)info.GetValue("m_bodyRot.w", typeof(float)), |
1943 | (float)info.GetValue("m_bodyRot.x", typeof(float)), | 1941 | (float)info.GetValue("m_bodyRot.x", typeof(float)), |
1944 | (float)info.GetValue("m_bodyRot.y", typeof(float)), | 1942 | (float)info.GetValue("m_bodyRot.y", typeof(float)), |
1945 | (float)info.GetValue("m_bodyRot.z", typeof(float))); | 1943 | (float)info.GetValue("m_bodyRot.z", typeof(float))); |
1946 | 1944 | ||
1947 | IsRestrictedToRegion = (bool)info.GetValue("IsRestrictedToRegion", typeof(bool)); | 1945 | IsRestrictedToRegion = (bool)info.GetValue("IsRestrictedToRegion", typeof(bool)); |
1948 | m_newForce = (bool)info.GetValue("m_newForce", typeof(bool)); | 1946 | m_newForce = (bool)info.GetValue("m_newForce", typeof(bool)); |
@@ -1964,33 +1962,33 @@ namespace OpenSim.Region.Environment.Scenes | |||
1964 | 1962 | ||
1965 | lastPhysPos | 1963 | lastPhysPos |
1966 | = new LLVector3( | 1964 | = new LLVector3( |
1967 | (float)info.GetValue("lastPhysPos.X", typeof(float)), | 1965 | (float)info.GetValue("lastPhysPos.X", typeof(float)), |
1968 | (float)info.GetValue("lastPhysPos.Y", typeof(float)), | 1966 | (float)info.GetValue("lastPhysPos.Y", typeof(float)), |
1969 | (float)info.GetValue("lastPhysPos.Z", typeof(float))); | 1967 | (float)info.GetValue("lastPhysPos.Z", typeof(float))); |
1970 | 1968 | ||
1971 | m_CameraCenter | 1969 | m_CameraCenter |
1972 | = new Vector3( | 1970 | = new Vector3( |
1973 | (float)info.GetValue("m_CameraCenter.X", typeof(float)), | 1971 | (float)info.GetValue("m_CameraCenter.X", typeof(float)), |
1974 | (float)info.GetValue("m_CameraCenter.Y", typeof(float)), | 1972 | (float)info.GetValue("m_CameraCenter.Y", typeof(float)), |
1975 | (float)info.GetValue("m_CameraCenter.Z", typeof(float))); | 1973 | (float)info.GetValue("m_CameraCenter.Z", typeof(float))); |
1976 | 1974 | ||
1977 | m_CameraAtAxis | 1975 | m_CameraAtAxis |
1978 | = new Vector3( | 1976 | = new Vector3( |
1979 | (float)info.GetValue("m_CameraAtAxis.X", typeof(float)), | 1977 | (float)info.GetValue("m_CameraAtAxis.X", typeof(float)), |
1980 | (float)info.GetValue("m_CameraAtAxis.Y", typeof(float)), | 1978 | (float)info.GetValue("m_CameraAtAxis.Y", typeof(float)), |
1981 | (float)info.GetValue("m_CameraAtAxis.Z", typeof(float))); | 1979 | (float)info.GetValue("m_CameraAtAxis.Z", typeof(float))); |
1982 | 1980 | ||
1983 | m_CameraLeftAxis | 1981 | m_CameraLeftAxis |
1984 | = new Vector3( | 1982 | = new Vector3( |
1985 | (float)info.GetValue("m_CameraLeftAxis.X", typeof(float)), | 1983 | (float)info.GetValue("m_CameraLeftAxis.X", typeof(float)), |
1986 | (float)info.GetValue("m_CameraLeftAxis.Y", typeof(float)), | 1984 | (float)info.GetValue("m_CameraLeftAxis.Y", typeof(float)), |
1987 | (float)info.GetValue("m_CameraLeftAxis.Z", typeof(float))); | 1985 | (float)info.GetValue("m_CameraLeftAxis.Z", typeof(float))); |
1988 | 1986 | ||
1989 | m_CameraUpAxis | 1987 | m_CameraUpAxis |
1990 | = new Vector3( | 1988 | = new Vector3( |
1991 | (float)info.GetValue("m_CameraUpAxis.X", typeof(float)), | 1989 | (float)info.GetValue("m_CameraUpAxis.X", typeof(float)), |
1992 | (float)info.GetValue("m_CameraUpAxis.Y", typeof(float)), | 1990 | (float)info.GetValue("m_CameraUpAxis.Y", typeof(float)), |
1993 | (float)info.GetValue("m_CameraUpAxis.Z", typeof(float))); | 1991 | (float)info.GetValue("m_CameraUpAxis.Z", typeof(float))); |
1994 | 1992 | ||
1995 | m_DrawDistance = (float)info.GetValue("m_DrawDistance", typeof(float)); | 1993 | m_DrawDistance = (float)info.GetValue("m_DrawDistance", typeof(float)); |
1996 | m_appearance = (AvatarAppearance)info.GetValue("m_appearance", typeof(AvatarAppearance)); | 1994 | m_appearance = (AvatarAppearance)info.GetValue("m_appearance", typeof(AvatarAppearance)); |
@@ -1998,9 +1996,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1998 | 1996 | ||
1999 | posLastSignificantMove | 1997 | posLastSignificantMove |
2000 | = new LLVector3( | 1998 | = new LLVector3( |
2001 | (float)info.GetValue("posLastSignificantMove.X", typeof(float)), | 1999 | (float)info.GetValue("posLastSignificantMove.X", typeof(float)), |
2002 | (float)info.GetValue("posLastSignificantMove.Y", typeof(float)), | 2000 | (float)info.GetValue("posLastSignificantMove.Y", typeof(float)), |
2003 | (float)info.GetValue("posLastSignificantMove.Z", typeof(float))); | 2001 | (float)info.GetValue("posLastSignificantMove.Z", typeof(float))); |
2004 | 2002 | ||
2005 | // m_partsUpdateQueue = (UpdateQueue)info.GetValue("m_partsUpdateQueue", typeof(UpdateQueue)); | 2003 | // m_partsUpdateQueue = (UpdateQueue)info.GetValue("m_partsUpdateQueue", typeof(UpdateQueue)); |
2006 | 2004 | ||
@@ -2018,41 +2016,41 @@ namespace OpenSim.Region.Environment.Scenes | |||
2018 | m_lastname = (string)info.GetValue("m_lastname", typeof(string)); | 2016 | m_lastname = (string)info.GetValue("m_lastname", typeof(string)); |
2019 | m_allowMovement = (bool)info.GetValue("m_allowMovement", typeof(bool)); | 2017 | m_allowMovement = (bool)info.GetValue("m_allowMovement", typeof(bool)); |
2020 | m_parentPosition = new LLVector3((float)info.GetValue("m_parentPosition.X", typeof(float)), | 2018 | m_parentPosition = new LLVector3((float)info.GetValue("m_parentPosition.X", typeof(float)), |
2021 | (float)info.GetValue("m_parentPosition.Y", typeof(float)), | 2019 | (float)info.GetValue("m_parentPosition.Y", typeof(float)), |
2022 | (float)info.GetValue("m_parentPosition.Z", typeof(float))); | 2020 | (float)info.GetValue("m_parentPosition.Z", typeof(float))); |
2023 | 2021 | ||
2024 | m_isChildAgent = (bool)info.GetValue("m_isChildAgent", typeof(bool)); | 2022 | m_isChildAgent = (bool)info.GetValue("m_isChildAgent", typeof(bool)); |
2025 | m_parentID = (uint)info.GetValue("m_parentID", typeof(uint)); | 2023 | m_parentID = (uint)info.GetValue("m_parentID", typeof(uint)); |
2026 | 2024 | ||
2027 | // for OpenSim_v0.5 | 2025 | // for OpenSim_v0.5 |
2028 | currentParcelUUID = new LLUUID((Guid)info.GetValue("currentParcelUUID", typeof(Guid))); | 2026 | currentParcelUUID = new LLUUID((Guid)info.GetValue("currentParcelUUID", typeof(Guid))); |
2029 | 2027 | ||
2030 | lastKnownAllowedPosition | 2028 | lastKnownAllowedPosition |
2031 | = new Vector3( | 2029 | = new Vector3( |
2032 | (float)info.GetValue("lastKnownAllowedPosition.X", typeof(float)), | 2030 | (float)info.GetValue("lastKnownAllowedPosition.X", typeof(float)), |
2033 | (float)info.GetValue("lastKnownAllowedPosition.Y", typeof(float)), | 2031 | (float)info.GetValue("lastKnownAllowedPosition.Y", typeof(float)), |
2034 | (float)info.GetValue("lastKnownAllowedPosition.Z", typeof(float))); | 2032 | (float)info.GetValue("lastKnownAllowedPosition.Z", typeof(float))); |
2035 | 2033 | ||
2036 | sentMessageAboutRestrictedParcelFlyingDown = (bool)info.GetValue("sentMessageAboutRestrictedParcelFlyingDown", typeof(bool)); | 2034 | sentMessageAboutRestrictedParcelFlyingDown = (bool)info.GetValue("sentMessageAboutRestrictedParcelFlyingDown", typeof(bool)); |
2037 | 2035 | ||
2038 | m_LastChildAgentUpdatePosition | 2036 | m_LastChildAgentUpdatePosition |
2039 | = new LLVector3( | 2037 | = new LLVector3( |
2040 | (float)info.GetValue("m_LastChildAgentUpdatePosition.X", typeof(float)), | 2038 | (float)info.GetValue("m_LastChildAgentUpdatePosition.X", typeof(float)), |
2041 | (float)info.GetValue("m_LastChildAgentUpdatePosition.Y", typeof(float)), | 2039 | (float)info.GetValue("m_LastChildAgentUpdatePosition.Y", typeof(float)), |
2042 | (float)info.GetValue("m_LastChildAgentUpdatePosition.Z", typeof(float))); | 2040 | (float)info.GetValue("m_LastChildAgentUpdatePosition.Z", typeof(float))); |
2043 | 2041 | ||
2044 | m_perfMonMS = (int)info.GetValue("m_perfMonMS", typeof(int)); | 2042 | m_perfMonMS = (int)info.GetValue("m_perfMonMS", typeof(int)); |
2045 | m_AgentControlFlags = (uint)info.GetValue("m_AgentControlFlags", typeof(uint)); | 2043 | m_AgentControlFlags = (uint)info.GetValue("m_AgentControlFlags", typeof(uint)); |
2046 | 2044 | ||
2047 | m_headrotation | 2045 | m_headrotation |
2048 | = new LLQuaternion( | 2046 | = new LLQuaternion( |
2049 | (float)info.GetValue("m_headrotation.W", typeof(float)), | 2047 | (float)info.GetValue("m_headrotation.W", typeof(float)), |
2050 | (float)info.GetValue("m_headrotation.X", typeof(float)), | 2048 | (float)info.GetValue("m_headrotation.X", typeof(float)), |
2051 | (float)info.GetValue("m_headrotation.Y", typeof(float)), | 2049 | (float)info.GetValue("m_headrotation.Y", typeof(float)), |
2052 | (float)info.GetValue("m_headrotation.Z", typeof(float))); | 2050 | (float)info.GetValue("m_headrotation.Z", typeof(float))); |
2053 | 2051 | ||
2054 | m_state = (byte)info.GetValue("m_state", typeof(byte)); | 2052 | m_state = (byte)info.GetValue("m_state", typeof(byte)); |
2055 | 2053 | ||
2056 | List<Guid> knownPrimUUID_work = (List<Guid>)info.GetValue("m_knownPrimUUID", typeof(List<Guid>)); | 2054 | List<Guid> knownPrimUUID_work = (List<Guid>)info.GetValue("m_knownPrimUUID", typeof(List<Guid>)); |
2057 | 2055 | ||
2058 | foreach (Guid id in knownPrimUUID_work) | 2056 | foreach (Guid id in knownPrimUUID_work) |
@@ -2064,9 +2062,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2064 | } | 2062 | } |
2065 | 2063 | ||
2066 | [SecurityPermission(SecurityAction.LinkDemand, | 2064 | [SecurityPermission(SecurityAction.LinkDemand, |
2067 | Flags = SecurityPermissionFlag.SerializationFormatter)] | 2065 | Flags = SecurityPermissionFlag.SerializationFormatter)] |
2068 | public override void GetObjectData( | 2066 | public override void GetObjectData( |
2069 | SerializationInfo info, StreamingContext context) | 2067 | SerializationInfo info, StreamingContext context) |
2070 | { | 2068 | { |
2071 | if (info == null) | 2069 | if (info == null) |
2072 | { | 2070 | { |
@@ -2196,17 +2194,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
2196 | info.AddValue("m_LastChildAgentUpdatePosition.X", m_LastChildAgentUpdatePosition.X); | 2194 | info.AddValue("m_LastChildAgentUpdatePosition.X", m_LastChildAgentUpdatePosition.X); |
2197 | info.AddValue("m_LastChildAgentUpdatePosition.Y", m_LastChildAgentUpdatePosition.Y); | 2195 | info.AddValue("m_LastChildAgentUpdatePosition.Y", m_LastChildAgentUpdatePosition.Y); |
2198 | info.AddValue("m_LastChildAgentUpdatePosition.Z", m_LastChildAgentUpdatePosition.Z); | 2196 | info.AddValue("m_LastChildAgentUpdatePosition.Z", m_LastChildAgentUpdatePosition.Z); |
2199 | 2197 | ||
2200 | info.AddValue("m_perfMonMS", m_perfMonMS); | 2198 | info.AddValue("m_perfMonMS", m_perfMonMS); |
2201 | info.AddValue("m_AgentControlFlags", m_AgentControlFlags); | 2199 | info.AddValue("m_AgentControlFlags", m_AgentControlFlags); |
2202 | 2200 | ||
2203 | info.AddValue("m_headrotation.W", m_headrotation.W); | 2201 | info.AddValue("m_headrotation.W", m_headrotation.W); |
2204 | info.AddValue("m_headrotation.X", m_headrotation.X); | 2202 | info.AddValue("m_headrotation.X", m_headrotation.X); |
2205 | info.AddValue("m_headrotation.Y", m_headrotation.Y); | 2203 | info.AddValue("m_headrotation.Y", m_headrotation.Y); |
2206 | info.AddValue("m_headrotation.Z", m_headrotation.Z); | 2204 | info.AddValue("m_headrotation.Z", m_headrotation.Z); |
2207 | 2205 | ||
2208 | info.AddValue("m_state", m_state); | 2206 | info.AddValue("m_state", m_state); |
2209 | 2207 | ||
2210 | List<Guid> knownPrimUUID_work = new List<Guid>(); | 2208 | List<Guid> knownPrimUUID_work = new List<Guid>(); |
2211 | 2209 | ||
2212 | foreach (LLUUID id in m_knownPrimUUID) | 2210 | foreach (LLUUID id in m_knownPrimUUID) |
@@ -2215,6 +2213,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2215 | } | 2213 | } |
2216 | 2214 | ||
2217 | info.AddValue("m_knownPrimUUID", knownPrimUUID_work); | 2215 | info.AddValue("m_knownPrimUUID", knownPrimUUID_work); |
2218 | } | 2216 | } |
2219 | } | 2217 | } |
2220 | } | 2218 | } |