diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 24c95d1..fe99ae5 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5810,7 +5810,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5810 | /// <param name='position'></param> | 5810 | /// <param name='position'></param> |
5811 | /// <param name='reason'></param> | 5811 | /// <param name='reason'></param> |
5812 | /// <returns></returns> | 5812 | /// <returns></returns> |
5813 | public bool QueryAccess(UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, out string reason) | 5813 | public bool QueryAccess(UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out string reason) |
5814 | { | 5814 | { |
5815 | reason = string.Empty; | 5815 | reason = string.Empty; |
5816 | 5816 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index a928db4..7ff3d40 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -374,6 +374,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
374 | return m_moduleCommanders; | 374 | return m_moduleCommanders; |
375 | } | 375 | } |
376 | 376 | ||
377 | public List<UUID> GetFormatsOffered() | ||
378 | { | ||
379 | List<UUID> ret = new List<UUID>(FormatsOffered); | ||
380 | |||
381 | return ret; | ||
382 | } | ||
383 | |||
377 | protected void CheckAndAddAgentDataFormats(object mod) | 384 | protected void CheckAndAddAgentDataFormats(object mod) |
378 | { | 385 | { |
379 | if (!(mod is IAgentStatefulModule)) | 386 | if (!(mod is IAgentStatefulModule)) |