aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-01 19:04:59 +0000
committerTeravus Ovares2009-04-01 19:04:59 +0000
commit74d5d44373b087a4c20ef7e05e450de5c2c210f2 (patch)
tree6138edcaaa802b80d5d1b51c850298d65782d0c3
parentHard code scaled image resolution to 96 dpi prior to sculpt meshing to preven... (diff)
downloadopensim-SC_OLD-74d5d44373b087a4c20ef7e05e450de5c2c210f2.zip
opensim-SC_OLD-74d5d44373b087a4c20ef7e05e450de5c2c210f2.tar.gz
opensim-SC_OLD-74d5d44373b087a4c20ef7e05e450de5c2c210f2.tar.bz2
opensim-SC_OLD-74d5d44373b087a4c20ef7e05e450de5c2c210f2.tar.xz
* Committing patch in mantis 3376 [Patch] Fix a minor animation handling glitch in ScenePresence
* .. * .. * err, okay, this was a stick-buggery April 1st joke by me. This removes it. Happy April 1st! * fixes mantis 3376
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs20
1 files changed, 0 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f7ea357..8b68d4f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -115,8 +115,6 @@ namespace OpenSim.Region.Framework.Scenes
115 115
116 private int m_perfMonMS; 116 private int m_perfMonMS;
117 117
118 private bool m_sitStatus;
119
120 private bool m_setAlwaysRun; 118 private bool m_setAlwaysRun;
121 119
122 private Quaternion m_bodyRot= Quaternion.Identity; 120 private Quaternion m_bodyRot= Quaternion.Identity;
@@ -565,8 +563,6 @@ namespace OpenSim.Region.Framework.Scenes
565 m_firstname = m_controllingClient.FirstName; 563 m_firstname = m_controllingClient.FirstName;
566 m_lastname = m_controllingClient.LastName; 564 m_lastname = m_controllingClient.LastName;
567 m_name = String.Format("{0} {1}", m_firstname, m_lastname); 565 m_name = String.Format("{0} {1}", m_firstname, m_lastname);
568 if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
569 m_sitStatus = true;
570 m_scene = world; 566 m_scene = world;
571 m_uuid = client.AgentId; 567 m_uuid = client.AgentId;
572 m_regionInfo = reginfo; 568 m_regionInfo = reginfo;
@@ -599,15 +595,11 @@ namespace OpenSim.Region.Framework.Scenes
599 : this(client, world, reginfo) 595 : this(client, world, reginfo)
600 { 596 {
601 m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams); 597 m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams);
602 if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
603 m_sitStatus = true;
604 } 598 }
605 599
606 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance) 600 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance)
607 : this(client, world, reginfo) 601 : this(client, world, reginfo)
608 { 602 {
609 if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
610 m_sitStatus = true;
611 m_appearance = appearance; 603 m_appearance = appearance;
612 } 604 }
613 605
@@ -2239,8 +2231,6 @@ namespace OpenSim.Region.Framework.Scenes
2239 remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, 2231 remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid,
2240 LocalId, m_pos, m_appearance.Texture.GetBytes(), 2232 LocalId, m_pos, m_appearance.Texture.GetBytes(),
2241 m_parentID, rot); 2233 m_parentID, rot);
2242 if (m_sitStatus)
2243 GenerateRandomAnimation();
2244 m_scene.AddAgentUpdates(1); 2234 m_scene.AddAgentUpdates(1);
2245 } 2235 }
2246 2236
@@ -2257,8 +2247,6 @@ namespace OpenSim.Region.Framework.Scenes
2257 // only send if this is the root (children are only "listening posts" in a foreign region) 2247 // only send if this is the root (children are only "listening posts" in a foreign region)
2258 if (!IsChildAgent) 2248 if (!IsChildAgent)
2259 { 2249 {
2260 if (m_sitStatus)
2261 GenerateRandomAnimation();
2262 SendFullUpdateToOtherClient(avatar); 2250 SendFullUpdateToOtherClient(avatar);
2263 } 2251 }
2264 2252
@@ -2268,8 +2256,6 @@ namespace OpenSim.Region.Framework.Scenes
2268 { 2256 {
2269 avatar.SendFullUpdateToOtherClient(this); 2257 avatar.SendFullUpdateToOtherClient(this);
2270 avatar.SendAppearanceToOtherAgent(this); 2258 avatar.SendAppearanceToOtherAgent(this);
2271 if (m_sitStatus)
2272 GenerateRandomAnimation();
2273 avatar.SendAnimPackToClient(ControllingClient); 2259 avatar.SendAnimPackToClient(ControllingClient);
2274 } 2260 }
2275 } 2261 }
@@ -2284,8 +2270,6 @@ namespace OpenSim.Region.Framework.Scenes
2284 { 2270 {
2285 m_perfMonMS = Environment.TickCount; 2271 m_perfMonMS = Environment.TickCount;
2286 2272
2287 if (m_sitStatus)
2288 GenerateRandomAnimation();
2289 // only send update from root agents to other clients; children are only "listening posts" 2273 // only send update from root agents to other clients; children are only "listening posts"
2290 List<ScenePresence> avatars = m_scene.GetAvatars(); 2274 List<ScenePresence> avatars = m_scene.GetAvatars();
2291 foreach (ScenePresence avatar in avatars) 2275 foreach (ScenePresence avatar in avatars)
@@ -2515,8 +2499,6 @@ namespace OpenSim.Region.Framework.Scenes
2515 m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y; 2499 m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y;
2516 m_LastChildAgentUpdatePosition.Z = AbsolutePosition.Z; 2500 m_LastChildAgentUpdatePosition.Z = AbsolutePosition.Z;
2517 2501
2518 if (m_sitStatus)
2519 GenerateRandomAnimation();
2520 } 2502 }
2521 } 2503 }
2522 2504
@@ -3078,8 +3060,6 @@ namespace OpenSim.Region.Framework.Scenes
3078 Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); 3060 Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
3079 DefaultTexture = textu.GetBytes(); 3061 DefaultTexture = textu.GetBytes();
3080 } 3062 }
3081 if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
3082 m_sitStatus = true;
3083 } 3063 }
3084 3064
3085 public void AddAttachment(SceneObjectGroup gobj) 3065 public void AddAttachment(SceneObjectGroup gobj)