diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneManager.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 4 |
2 files changed, 19 insertions, 2 deletions
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 | |||
274 | return false; | 274 | return false; |
275 | } | 275 | } |
276 | 276 | ||
277 | public bool TryGetAvatarsScene(LLUUID avatarId, out Scene scene) | ||
278 | { | ||
279 | ScenePresence avatar = null; | ||
280 | foreach (Scene mScene in m_localScenes) | ||
281 | { | ||
282 | if (mScene.TryGetAvatar(avatarId, out avatar)) | ||
283 | { | ||
284 | scene = mScene; | ||
285 | return true; | ||
286 | } | ||
287 | } | ||
288 | |||
289 | scene = null; | ||
290 | return false; | ||
291 | } | ||
292 | |||
293 | |||
277 | public void CloseScene(Scene scene) | 294 | public void CloseScene(Scene scene) |
278 | { | 295 | { |
279 | m_localScenes.Remove(scene); | 296 | 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 | |||
125 | set { m_name = value; } | 125 | set { m_name = value; } |
126 | } | 126 | } |
127 | 127 | ||
128 | protected LLObject.ObjectFlags m_flags; | 128 | protected LLObject.ObjectFlags m_flags =0; |
129 | 129 | ||
130 | public uint ObjectFlags | 130 | public uint ObjectFlags |
131 | { | 131 | { |
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
133 | set { m_flags = (LLObject.ObjectFlags) value; } | 133 | set { m_flags = (LLObject.ObjectFlags) value; } |
134 | } | 134 | } |
135 | 135 | ||
136 | protected LLObject.MaterialType m_material; | 136 | protected LLObject.MaterialType m_material =0; |
137 | 137 | ||
138 | public byte Material | 138 | public byte Material |
139 | { | 139 | { |