aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorlbsa712007-09-23 23:55:29 +0000
committerlbsa712007-09-23 23:55:29 +0000
commitb3eeb5a8dcdb91d47037234540c5045cdfb9977a (patch)
tree47e5965e061861cb1ee57bee4b319b432e8f63d8 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentfix to do hollow prims correctly. Reported from (diff)
downloadopensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.zip
opensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.tar.gz
opensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.tar.bz2
opensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.tar.xz
* Purged 'Regions' code pending Agent layer grok.
* Changed so prims aren't loaded until AFTER parcels. * The region startup flow is still an ungodly rats nest.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs12
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index fa37b9f..f594789 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities; 36using OpenSim.Framework.Utilities;
37using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
38using OpenSim.Region.Environment.Regions;
39 38
40namespace OpenSim.Region.Environment.Scenes 39namespace OpenSim.Region.Environment.Scenes
41{ 40{
@@ -214,13 +213,6 @@ namespace OpenSim.Region.Environment.Scenes
214 set { m_isChildAgent = value; } 213 set { m_isChildAgent = value; }
215 } 214 }
216 215
217 private RegionSubscription m_regionSubscription;
218
219 public RegionSubscription RegionSubscription
220 {
221 get { return m_regionSubscription; }
222 }
223
224 #endregion 216 #endregion
225 217
226 #region Constructor(s) 218 #region Constructor(s)
@@ -234,8 +226,6 @@ namespace OpenSim.Region.Environment.Scenes
234 /// <param name="regionDat"></param> 226 /// <param name="regionDat"></param>
235 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo) 227 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo)
236 { 228 {
237 m_regionSubscription = new RegionSubscription( client );
238
239 m_scene = world; 229 m_scene = world;
240 m_uuid = client.AgentId; 230 m_uuid = client.AgentId;
241 231
@@ -881,7 +871,7 @@ namespace OpenSim.Region.Environment.Scenes
881 } 871 }
882 } 872 }
883 873
884 public static void CreateDefaultTextureEntry() 874 static ScenePresence()
885 { 875 {
886 LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); 876 LLObject.TextureEntry textu = new LLObject.TextureEntry(new LLUUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97"));
887 textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012"); 877 textu.CreateFace(0).TextureID = new LLUUID("00000000-0000-1111-9999-000000000012");