aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation.cs (renamed from OpenSim/Region/Environment/Scenes/Animation.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/AnimationSet.cs (renamed from OpenSim/Region/Environment/Scenes/AnimationSet.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs (renamed from OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/AvatarAnimations.cs (renamed from OpenSim/Region/Environment/Scenes/AvatarAnimations.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs (renamed from OpenSim/Region/Environment/Scenes/EntityBase.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityManager.cs (renamed from OpenSim/Region/Environment/Scenes/EntityManager.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs (renamed from OpenSim/Region/Environment/Scenes/EventManager.cs)7
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs (renamed from OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs)19
-rw-r--r--OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs (renamed from OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/ReturnInfo.cs (renamed from OpenSim/Region/Environment/Scenes/ReturnInfo.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.Inventory.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.Permissions.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.cs)26
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs (renamed from OpenSim/Region/Environment/Scenes/SceneBase.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs (renamed from OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs)27
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs (renamed from OpenSim/Region/Environment/Scenes/SceneGraph.cs)15
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs (renamed from OpenSim/Region/Environment/Scenes/SceneManager.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectPart.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (renamed from OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs)7
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs (renamed from OpenSim/Region/Environment/Scenes/ScenePresence.cs)14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs (renamed from OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs (renamed from OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs)2
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs (renamed from OpenSim/Region/Environment/Scenes/SimStatsReporter.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainChannel.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainUtil.cs (renamed from OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs)0
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs)0
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs)6
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs (renamed from OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs (renamed from OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs (renamed from OpenSim/Region/Environment/Types/UpdateQueue.cs)4
-rw-r--r--OpenSim/Region/Framework/Scenes/UndoState.cs (renamed from OpenSim/Region/Environment/Scenes/UndoState.cs)2
42 files changed, 111 insertions, 118 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs
index 2854e06..3504717 100644
--- a/OpenSim/Region/Environment/Scenes/Animation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.Environment.Scenes 31namespace OpenSim.Region.Framework.Scenes
32{ 32{
33 public class Animation 33 public class Animation
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index df25173..f53bb78 100644
--- a/OpenSim/Region/Environment/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Framework.Scenes
33{ 33{
34 public class AnimationSet 34 public class AnimationSet
35 { 35 {
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 1429452..178f1f7 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
34using OpenMetaverse.Packets; 34using OpenMetaverse.Packets;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 class DeleteToInventoryHolder 39 class DeleteToInventoryHolder
40 { 40 {
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
index d4dd0db..562fcf9 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
29using System.Xml; 29using System.Xml;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Framework.Scenes
33{ 33{
34 public class AvatarAnimations 34 public class AvatarAnimations
35 { 35 {
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 3ae8cde..5055e44 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -30,7 +30,7 @@ using System.Runtime.Serialization;
30using System.Security.Permissions; 30using System.Security.Permissions;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Region.Environment.Scenes 33namespace OpenSim.Region.Framework.Scenes
34{ 34{
35 [Serializable] 35 [Serializable]
36 public abstract class EntityBase : ISerializable 36 public abstract class EntityBase : ISerializable
diff --git a/OpenSim/Region/Environment/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index f89d361..a322766 100644
--- a/OpenSim/Region/Environment/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -33,7 +33,7 @@ using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34 34
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 public class EntityManager : IEnumerable<EntityBase> 38 public class EntityManager : IEnumerable<EntityBase>
39 { 39 {
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index bba7eed..23e1278 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -29,11 +29,12 @@ using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Client; 31using OpenSim.Framework.Client;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 33using OpenSim.Region.Framework.Scenes;
34using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
34using System.Collections.Generic; 35using System.Collections.Generic;
35 36
36namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Framework.Scenes
37{ 38{
38 /// <summary> 39 /// <summary>
39 /// A class for triggering remote scene events. 40 /// A class for triggering remote scene events.
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 73a5a3a..bd9c260 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -40,13 +40,13 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment; 43// using OpenSim.Region.Environment;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Framework.Scenes;
45 45
46//using HyperGrid.Framework; 46//using HyperGrid.Framework;
47//using OpenSim.Region.Communications.Hypergrid; 47//using OpenSim.Region.Communications.Hypergrid;
48 48
49namespace OpenSim.Region.Environment.Scenes.Hypergrid 49namespace OpenSim.Region.Framework.Scenes.Hypergrid
50{ 50{
51 public class HGAssetMapper 51 public class HGAssetMapper
52 { 52 {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index bdb90d8..f36075e 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -40,10 +40,10 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment; 43// using OpenSim.Region.Environment;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Framework.Scenes;
45 45
46namespace OpenSim.Region.Environment.Scenes.Hypergrid 46namespace OpenSim.Region.Framework.Scenes.Hypergrid
47{ 47{
48 public partial class HGScene : Scene 48 public partial class HGScene : Scene
49 { 49 {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index ca644a6..a52fdc6 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -34,11 +34,11 @@ using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Region.Environment; 37// using OpenSim.Region.Environment;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using TPFlags = OpenSim.Framework.Constants.TeleportFlags; 39using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
40 40
41namespace OpenSim.Region.Environment.Scenes.Hypergrid 41namespace OpenSim.Region.Framework.Scenes.Hypergrid
42{ 42{
43 public partial class HGScene : Scene 43 public partial class HGScene : Scene
44 { 44 {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 5e3e03f..d0dc4f7 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -38,11 +38,11 @@ using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Communications.Capabilities; 40using OpenSim.Framework.Communications.Capabilities;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Environment; 42// using OpenSim.Region.Environment;
43using OpenSim.Region.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
44 44
45namespace OpenSim.Region.Environment.Scenes.Hypergrid 45namespace OpenSim.Region.Framework.Scenes.Hypergrid
46{ 46{
47 public class HGSceneCommunicationService : SceneCommunicationService 47 public class HGSceneCommunicationService : SceneCommunicationService
48 { 48 {
@@ -208,16 +208,14 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
208 208
209 if (eq != null) 209 if (eq != null)
210 { 210 {
211 OSD Item = EventQueueHelper.EnableSimulator(realHandle, endPoint); 211 eq.EnableSimulator(realHandle, endPoint, avatar.UUID);
212 eq.Enqueue(Item, avatar.UUID);
213 212
214 // ES makes the client send a UseCircuitCode message to the destination, 213 // ES makes the client send a UseCircuitCode message to the destination,
215 // which triggers a bunch of things there. 214 // which triggers a bunch of things there.
216 // So let's wait 215 // So let's wait
217 Thread.Sleep(2000); 216 Thread.Sleep(2000);
218 217
219 Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); 218 eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
220 eq.Enqueue(Item, avatar.UUID);
221 } 219 }
222 else 220 else
223 { 221 {
@@ -267,9 +265,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
267 /// 265 ///
268 if (eq != null) 266 if (eq != null)
269 { 267 {
270 OSD Item = EventQueueHelper.TeleportFinishEvent(realHandle, 13, endPoint, 268 eq.TeleportFinishEvent(realHandle, 13, endPoint,
271 4, teleportFlags, capsPath, avatar.UUID); 269 4, teleportFlags, capsPath, avatar.UUID);
272 eq.Enqueue(Item, avatar.UUID);
273 } 270 }
274 else 271 else
275 { 272 {
diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs
index 9a4c72f..bd5ad33 100644
--- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Framework/Scenes/IScenePresenceBody.cs
@@ -28,7 +28,7 @@
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30 30
31namespace OpenSim.Region.Environment.Scenes 31namespace OpenSim.Region.Framework.Scenes
32{ 32{
33 public interface IScenePresenceBody 33 public interface IScenePresenceBody
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs
index 898baab..43d07f5 100644
--- a/OpenSim/Region/Environment/Scenes/ReturnInfo.cs
+++ b/OpenSim/Region/Framework/Scenes/ReturnInfo.cs
@@ -27,7 +27,7 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29 29
30namespace OpenSim.Region.Environment.Scenes 30namespace OpenSim.Region.Framework.Scenes
31{ 31{
32 public struct ReturnInfo 32 public struct ReturnInfo
33 { 33 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bc80d56..e366c79 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -34,10 +34,10 @@ using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Region.Interfaces; 37using OpenSim.Region.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39 39
40namespace OpenSim.Region.Environment.Scenes 40namespace OpenSim.Region.Framework.Scenes
41{ 41{
42 public partial class Scene 42 public partial class Scene
43 { 43 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 3334e81..039b81b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 public partial class Scene 38 public partial class Scene
39 { 39 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 0872128..6aa617f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Scenes 35namespace OpenSim.Region.Framework.Scenes
36{ 36{
37 public class ScenePermissions 37 public class ScenePermissions
38 { 38 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f798a0e..f07391d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -40,10 +40,8 @@ using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
44using OpenSim.Region.Interfaces; 44using OpenSim.Region.Framework.Scenes.Scripting;
45using OpenSim.Region.Environment.Modules.World.Terrain;
46using OpenSim.Region.Environment.Scenes.Scripting;
47using OpenSim.Region.Physics.Manager; 45using OpenSim.Region.Physics.Manager;
48using Nini.Config; 46using Nini.Config;
49using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 47using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
@@ -52,7 +50,7 @@ using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
52using Timer = System.Timers.Timer; 50using Timer = System.Timers.Timer;
53using OSD = OpenMetaverse.StructuredData.OSD; 51using OSD = OpenMetaverse.StructuredData.OSD;
54 52
55namespace OpenSim.Region.Environment.Scenes 53namespace OpenSim.Region.Framework.Scenes
56{ 54{
57 public delegate bool FilterAvatarList(ScenePresence avatar); 55 public delegate bool FilterAvatarList(ScenePresence avatar);
58 56
@@ -123,7 +121,12 @@ namespace OpenSim.Region.Environment.Scenes
123 protected IInterregionCommsOut m_interregionCommsOut; 121 protected IInterregionCommsOut m_interregionCommsOut;
124 protected IInterregionCommsIn m_interregionCommsIn; 122 protected IInterregionCommsIn m_interregionCommsIn;
125 protected IDialogModule m_dialogModule; 123 protected IDialogModule m_dialogModule;
126 protected internal ICapabilitiesModule CapsModule; 124
125 protected ICapabilitiesModule m_capsModule;
126 public ICapabilitiesModule CapsModule
127 {
128 get { return m_capsModule; }
129 }
127 130
128 // Central Update Loop 131 // Central Update Loop
129 132
@@ -747,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes
747 m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>(); 750 m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>();
748 m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>(); 751 m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>();
749 m_dialogModule = RequestModuleInterface<IDialogModule>(); 752 m_dialogModule = RequestModuleInterface<IDialogModule>();
750 CapsModule = RequestModuleInterface<ICapabilitiesModule>(); 753 m_capsModule = RequestModuleInterface<ICapabilitiesModule>();
751 } 754 }
752 755
753 #endregion 756 #endregion
@@ -972,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
972 /// Perform delegate action on all clients subscribing to updates from this region. 975 /// Perform delegate action on all clients subscribing to updates from this region.
973 /// </summary> 976 /// </summary>
974 /// <returns></returns> 977 /// <returns></returns>
975 internal void Broadcast(Action<IClientAPI> whatToDo) 978 public void Broadcast(Action<IClientAPI> whatToDo)
976 { 979 {
977 ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); 980 ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); });
978 } 981 }
@@ -2965,8 +2968,7 @@ namespace OpenSim.Region.Environment.Scenes
2965 IEventQueue eq = RequestModuleInterface<IEventQueue>(); 2968 IEventQueue eq = RequestModuleInterface<IEventQueue>();
2966 if (eq != null) 2969 if (eq != null)
2967 { 2970 {
2968 OSD Item = EventQueueHelper.DisableSimulator(RegionInfo.RegionHandle); 2971 eq.DisableSimulator(RegionInfo.RegionHandle, agentID);
2969 eq.Enqueue(Item, agentID);
2970 } 2972 }
2971 else 2973 else
2972 presence.ControllingClient.SendShutdownConnectionNotice(); 2974 presence.ControllingClient.SendShutdownConnectionNotice();
@@ -3792,12 +3794,12 @@ namespace OpenSim.Region.Environment.Scenes
3792 return m_sceneGraph.GetSceneObjectPart(fullID); 3794 return m_sceneGraph.GetSceneObjectPart(fullID);
3793 } 3795 }
3794 3796
3795 internal bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) 3797 public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
3796 { 3798 {
3797 return m_sceneGraph.TryGetAvatar(avatarId, out avatar); 3799 return m_sceneGraph.TryGetAvatar(avatarId, out avatar);
3798 } 3800 }
3799 3801
3800 internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) 3802 public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
3801 { 3803 {
3802 return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar); 3804 return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar);
3803 } 3805 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 5b78617..6d61e9f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 public abstract class SceneBase : IScene 40 public abstract class SceneBase : IScene
41 { 41 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9935512..a2b2537 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -33,14 +33,13 @@ using System.Threading;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.StructuredData; 34using OpenMetaverse.StructuredData;
35using log4net; 35using log4net;
36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Capabilities; 38using OpenSim.Framework.Communications.Capabilities;
40using OpenSim.Region.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
41using OSD = OpenMetaverse.StructuredData.OSD; 40using OSD = OpenMetaverse.StructuredData.OSD;
42 41
43namespace OpenSim.Region.Environment.Scenes 42namespace OpenSim.Region.Framework.Scenes
44{ 43{
45 public delegate void KiPrimitiveDelegate(uint localID); 44 public delegate void KiPrimitiveDelegate(uint localID);
46 45
@@ -305,13 +304,10 @@ namespace OpenSim.Region.Environment.Scenes
305 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); 304 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
306 if (eq != null) 305 if (eq != null)
307 { 306 {
308 OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint); 307 eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
309 eq.Enqueue(Item, avatar.UUID); 308 eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
310 309 m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}",
311 Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); 310 capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
312 eq.Enqueue(Item, avatar.UUID);
313
314 m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
315 } 311 }
316 else 312 else
317 { 313 {
@@ -806,16 +802,14 @@ namespace OpenSim.Region.Environment.Scenes
806 802
807 if (eq != null) 803 if (eq != null)
808 { 804 {
809 OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint); 805 eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
810 eq.Enqueue(Item, avatar.UUID);
811 806
812 // ES makes the client send a UseCircuitCode message to the destination, 807 // ES makes the client send a UseCircuitCode message to the destination,
813 // which triggers a bunch of things there. 808 // which triggers a bunch of things there.
814 // So let's wait 809 // So let's wait
815 Thread.Sleep(2000); 810 Thread.Sleep(2000);
816 811
817 Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath); 812 eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
818 eq.Enqueue(Item, avatar.UUID);
819 } 813 }
820 else 814 else
821 { 815 {
@@ -860,9 +854,8 @@ namespace OpenSim.Region.Environment.Scenes
860 854
861 if (eq != null) 855 if (eq != null)
862 { 856 {
863 OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, endPoint, 857 eq.TeleportFinishEvent(reg.RegionHandle, 13, endPoint,
864 4, teleportFlags, capsPath, avatar.UUID); 858 4, teleportFlags, capsPath, avatar.UUID);
865 eq.Enqueue(Item, avatar.UUID);
866 } 859 }
867 else 860 else
868 { 861 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 24eaad1..2877dcd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -32,10 +32,10 @@ using OpenMetaverse;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Types; 35using OpenSim.Region.Framework.Scenes.Types;
36using OpenSim.Region.Physics.Manager; 36using OpenSim.Region.Physics.Manager;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 public delegate void PhysicsCrash(); 40 public delegate void PhysicsCrash();
41 41
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes
312 /// Delete an object from the scene 312 /// Delete an object from the scene
313 /// </summary> 313 /// </summary>
314 /// <returns>true if the object was deleted, false if there was no object to delete</returns> 314 /// <returns>true if the object was deleted, false if there was no object to delete</returns>
315 protected internal bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked) 315 public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
316 { 316 {
317 if (Entities.ContainsKey(uuid)) 317 if (Entities.ContainsKey(uuid))
318 { 318 {
@@ -797,8 +797,11 @@ namespace OpenSim.Region.Environment.Scenes
797 /// suitable solution). 797 /// suitable solution).
798 /// </summary> 798 /// </summary>
799 /// <param name="agentId"></param> 799 /// <param name="agentId"></param>
800 /// <returns>null if either the avatar wasn't in the scene, or they do not have a controlling client</returns> 800 /// <returns>null if either the avatar wasn't in the scene, or
801 protected internal IClientAPI GetControllingClient(UUID agentId) 801 /// they do not have a controlling client</returns>
802 /// <remarks>this used to be protected internal, but that
803 /// prevents CapabilitiesModule from accessing it</remarks>
804 public IClientAPI GetControllingClient(UUID agentId)
802 { 805 {
803 ScenePresence presence = GetScenePresence(agentId); 806 ScenePresence presence = GetScenePresence(agentId);
804 807
@@ -1034,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes
1034 return Entities.GetEntities(); 1037 return Entities.GetEntities();
1035 } 1038 }
1036 1039
1037 protected internal Dictionary<uint, float> GetTopScripts() 1040 public Dictionary<uint, float> GetTopScripts()
1038 { 1041 {
1039 Dictionary<uint, float> topScripts = new Dictionary<uint, float>(); 1042 Dictionary<uint, float> topScripts = new Dictionary<uint, float>();
1040 1043
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index b28eef2..180f8a1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -32,9 +32,9 @@ using System.Reflection;
32using OpenMetaverse; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36 36
37namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 public delegate void RestartSim(RegionInfo thisregion); 39 public delegate void RestartSim(RegionInfo thisregion);
40 40
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 053e0da..5fa6609 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -31,11 +31,11 @@ using System.Reflection;
31using OpenMetaverse; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Xml; 36using System.Xml;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 public partial class SceneObjectGroup : EntityBase 40 public partial class SceneObjectGroup : EntityBase
41 { 41 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5ae95ee..57d9ce4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -34,10 +34,10 @@ using System.Xml.Serialization;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Packets; 35using OpenMetaverse.Packets;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Physics.Manager; 38using OpenSim.Region.Physics.Manager;
39 39
40namespace OpenSim.Region.Environment.Scenes 40namespace OpenSim.Region.Framework.Scenes
41{ 41{
42 [Flags] 42 [Flags]
43 public enum scriptEvents 43 public enum scriptEvents
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 256d6f8..dfa9318 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -37,11 +37,11 @@ using log4net;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.Packets; 38using OpenMetaverse.Packets;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Environment.Scenes.Scripting; 41using OpenSim.Region.Framework.Scenes.Scripting;
42using OpenSim.Region.Physics.Manager; 42using OpenSim.Region.Physics.Manager;
43 43
44namespace OpenSim.Region.Environment.Scenes 44namespace OpenSim.Region.Framework.Scenes
45{ 45{
46 #region Enumerations 46 #region Enumerations
47 47
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 8137a53..efd486d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -32,11 +32,10 @@ using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Scenes.Scripting;
37using OpenSim.Region.Environment.Scenes.Scripting;
38 37
39namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
40{ 39{
41 public class SceneObjectPartInventory : IEntityInventory 40 public class SceneObjectPartInventory : IEntityInventory
42 { 41 {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ed455f4..36cd862 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -36,13 +36,12 @@ using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Client; 37using OpenSim.Framework.Client;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Types; 40using OpenSim.Region.Framework.Scenes.Types;
41using OpenSim.Region.Interfaces;
42using OpenSim.Region.Physics.Manager; 41using OpenSim.Region.Physics.Manager;
43using OSD = OpenMetaverse.StructuredData.OSD; 42using OSD = OpenMetaverse.StructuredData.OSD;
44 43
45namespace OpenSim.Region.Environment.Scenes 44namespace OpenSim.Region.Framework.Scenes
46{ 45{
47 enum ScriptControlled : uint 46 enum ScriptControlled : uint
48 { 47 {
@@ -2474,10 +2473,9 @@ namespace OpenSim.Region.Environment.Scenes
2474 2473
2475 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); 2474 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>();
2476 if (eq != null) 2475 if (eq != null)
2477 { 2476 {
2478 OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, 2477 eq.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
2479 capsPath, UUID, ControllingClient.SessionId); 2478 capsPath, UUID, ControllingClient.SessionId);
2480 eq.Enqueue(Item, UUID);
2481 } 2479 }
2482 else 2480 else
2483 { 2481 {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
index 2e9c551..7d9d247 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
@@ -35,7 +35,7 @@ using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Physics.Manager; 36using OpenSim.Region.Physics.Manager;
37 37
38namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Framework.Scenes
39{ 39{
40 /// <summary> 40 /// <summary>
41 /// Static methods to serialize and deserialize scene objects to and from XML 41 /// Static methods to serialize and deserialize scene objects to and from XML
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
index 152825f..440820b 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs
@@ -27,7 +27,7 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29 29
30namespace OpenSim.Region.Environment.Scenes.Scripting 30namespace OpenSim.Region.Framework.Scenes.Scripting
31{ 31{
32 public interface IScriptHost 32 public interface IScriptHost
33 { 33 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
index 37f5d43..fd7ff96 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30 30
31namespace OpenSim.Region.Environment.Scenes.Scripting 31namespace OpenSim.Region.Framework.Scenes.Scripting
32{ 32{
33 public class NullScriptHost : IScriptHost 33 public class NullScriptHost : IScriptHost
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs
index b1ee519..d358187 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineInterface.cs
@@ -27,7 +27,7 @@
27 27
28//TODO: WHERE TO PLACE THIS? 28//TODO: WHERE TO PLACE THIS?
29 29
30namespace OpenSim.Region.Environment.Scenes.Scripting 30namespace OpenSim.Region.Framework.Scenes.Scripting
31{ 31{
32 public interface ScriptEngineInterface 32 public interface ScriptEngineInterface
33 { 33 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
index 6216e2c..58228cc 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
@@ -31,7 +31,7 @@ using System.IO;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33 33
34namespace OpenSim.Region.Environment.Scenes.Scripting 34namespace OpenSim.Region.Framework.Scenes.Scripting
35{ 35{
36 public class ScriptEngineLoader 36 public class ScriptEngineLoader
37 { 37 {
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index efda140..b2cea5d 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -31,9 +31,9 @@ using System.Timers;
31using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Statistics; 33using OpenSim.Framework.Statistics;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 public class SimStatsReporter 38 public class SimStatsReporter
39 { 39 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 1534c4b..55c5181 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -26,14 +26,14 @@
26 */ 26 */
27 27
28using OpenSim.Framework; 28using OpenSim.Framework;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using System; 30using System;
31using System.Text; 31using System.Text;
32using System.Xml; 32using System.Xml;
33using System.IO; 33using System.IO;
34using System.Xml.Serialization; 34using System.Xml.Serialization;
35 35
36namespace OpenSim.Region.Environment.Modules.World.Terrain 36namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 /// <summary> 38 /// <summary>
39 /// A new version of the old Channel class, simplified 39 /// A new version of the old Channel class, simplified
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Framework/Scenes/TerrainUtil.cs
index b20ff42..318a682 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainUtil.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.World.Terrain 31namespace OpenSim.Region.Framework.Scenes
32{ 32{
33 public static class TerrainUtil 33 public static class TerrainUtil
34 { 34 {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 0155966..2c6ccc8 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -35,10 +35,10 @@ using NUnit.Framework.SyntaxHelpers;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Tests.Common.Setup; 39using OpenSim.Tests.Common.Setup;
40 40
41namespace OpenSim.Region.Environment.Scenes.Tests 41namespace OpenSim.Region.Framework.Scenes.Tests
42{ 42{
43 [TestFixture] 43 [TestFixture]
44 public class EntityManagerTests 44 public class EntityManagerTests
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index d063eae..d063eae 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 30b0987..30b0987 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index d66c365..dc8df32 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -34,14 +34,14 @@ using NUnit.Framework.SyntaxHelpers;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Modules.Communications.Local; 39using OpenSim.Region.Environment.Modules.Communications.Local;
40using OpenSim.Region.Environment.Modules.World.Serialiser; 40using OpenSim.Region.Environment.Modules.World.Serialiser;
41using OpenSim.Tests.Common.Mock; 41using OpenSim.Tests.Common.Mock;
42using OpenSim.Tests.Common.Setup; 42using OpenSim.Tests.Common.Setup;
43 43
44namespace OpenSim.Region.Environment.Scenes.Tests 44namespace OpenSim.Region.Framework.Scenes.Tests
45{ 45{
46 /// <summary> 46 /// <summary>
47 /// Scene presence tests 47 /// Scene presence tests
diff --git a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 221d97f..a78faa6 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -32,12 +32,12 @@ using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Region.Environment; 34using OpenSim.Region.Environment;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Modules.Communications.REST; 36using OpenSim.Region.Environment.Modules.Communications.REST;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39 39
40namespace OpenSim.Region.Environment.Scenes.Tests 40namespace OpenSim.Region.Framework.Scenes.Tests
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Teleport tests in a standalone OpenSim 43 /// Teleport tests in a standalone OpenSim
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
index 24ce94b..9fbbb15 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
@@ -27,9 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Framework.Scenes;
31 31
32namespace OpenSim.Region.Environment.Types 32namespace OpenSim.Region.Framework.Scenes.Types
33{ 33{
34 public class BasicQuadTreeNode 34 public class BasicQuadTreeNode
35 { 35 {
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 0c86df2..452ada9 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.Runtime.Serialization; 30using System.Runtime.Serialization;
31using System.Security.Permissions; 31using System.Security.Permissions;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34 34
35namespace OpenSim.Region.Environment.Types 35namespace OpenSim.Region.Framework.Scenes.Types
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class UpdateQueue : ISerializable 38 public class UpdateQueue : ISerializable
diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index d828d8d..3d48229 100644
--- a/OpenSim/Region/Environment/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -27,7 +27,7 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29 29
30namespace OpenSim.Region.Environment.Scenes 30namespace OpenSim.Region.Framework.Scenes
31{ 31{
32 public class UndoState 32 public class UndoState
33 { 33 {