aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2009-11-28 09:26:00 +0000
committerMelanie2009-11-28 09:26:00 +0000
commitd3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch)
tree044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Region/Framework/Scenes/Scene.cs
parentReset update flag when a SOG is deleted. This fixes llDie(); (diff)
parentAdd some conditionals to references to the WorldComm module, so that the (diff)
downloadopensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3034f9a..c12c81b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4410,16 +4410,6 @@ namespace OpenSim.Region.Framework.Scenes
4410 4410
4411 #endregion 4411 #endregion
4412 4412
4413 #region Avatar Appearance Default
4414
4415 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
4416 {
4417 visualParams = AvatarAppearance.GetDefaultVisualParams();
4418 wearables = AvatarWearable.DefaultWearables;
4419 }
4420
4421 #endregion
4422
4423 public void RegionHandleRequest(IClientAPI client, UUID regionID) 4413 public void RegionHandleRequest(IClientAPI client, UUID regionID)
4424 { 4414 {
4425 ulong handle = 0; 4415 ulong handle = 0;