aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
committerTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
commite7333515d95f063ce5dfe714b4cf34db85549a90 (patch)
treecf320591d49e96c67baffdb1f96c4165eafc2741 /OpenSim/Region/Framework/Scenes
parent* Re-enable lightweight packet tracking stats on a 3000 ms interval. (diff)
parentRename TestAssetDataPlugin to MockAssetDataPlugin (diff)
downloadopensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.zip
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.gz
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.bz2
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs1
2 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2558757..fbabb5c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4398,16 +4398,6 @@ namespace OpenSim.Region.Framework.Scenes
4398 4398
4399 #endregion 4399 #endregion
4400 4400
4401 #region Avatar Appearance Default
4402
4403 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
4404 {
4405 visualParams = AvatarAppearance.GetDefaultVisualParams();
4406 wearables = AvatarWearable.DefaultWearables;
4407 }
4408
4409 #endregion
4410
4411 public void RegionHandleRequest(IClientAPI client, UUID regionID) 4401 public void RegionHandleRequest(IClientAPI client, UUID regionID)
4412 { 4402 {
4413 ulong handle = 0; 4403 ulong handle = 0;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6ec2a01..7359011 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1199,6 +1199,7 @@ namespace OpenSim.Region.Framework.Scenes
1199 1199
1200 if (!silent) 1200 if (!silent)
1201 { 1201 {
1202 part.UpdateFlag = 0;
1202 if (part == m_rootPart) 1203 if (part == m_rootPart)
1203 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId); 1204 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
1204 } 1205 }