From 27f003b68314ea5136632d6f9d14057c96ade1e1 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 29 Oct 2007 09:51:23 +0000
Subject: Started the process of cleaning up AssetCache and moving most of the
 code into modules. Have moved TextureRequest handling (from the client) to a
 module. But even though to start with I just did a little bit of cleaning up
 of the existing code, it doesn't seem to work as good as the old code so I
 need to spend more time on it. So for now am committing my changes but with
 them not in use. So for now all Texture and asset requests are still handled
 by the old code in AssetCache.

---
 OpenSim/Region/Environment/Scenes/SceneManager.cs    | 17 +++++++++++++++++
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 7db6927..76ff6cf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -274,6 +274,23 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
+        public bool TryGetAvatarsScene(LLUUID avatarId, out Scene scene)
+        {
+            ScenePresence avatar = null;
+            foreach (Scene mScene in m_localScenes)
+            {
+                if (mScene.TryGetAvatar(avatarId, out avatar))
+                {
+                    scene = mScene;
+                    return true;
+                }
+            }
+
+            scene = null;
+            return false;
+        }
+
+
         public void CloseScene(Scene scene)
         {
             m_localScenes.Remove(scene);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 58d2157..a0d1d2a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_name = value; }
         }
 
-        protected LLObject.ObjectFlags m_flags;
+        protected LLObject.ObjectFlags m_flags =0;
 
         public uint ObjectFlags
         {
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_flags = (LLObject.ObjectFlags) value; }
         }
 
-        protected LLObject.MaterialType m_material;
+        protected LLObject.MaterialType m_material =0;
 
         public byte Material
         {
-- 
cgit v1.1