*Some more restructuring/fixing -- should compile, but high chance I forgot to add/remove something

24 files changed, 82 insertions, 87 deletions

diff --git a/OpenSim/Region/Simulation/Caps.cs b/OpenSim/Region/Simulation/Caps.cs
index 13a351d..9edbd54 100644
--- a/OpenSim/Region/Simulation/Caps.cs
+++ b/OpenSim/Region/Simulation/Caps.cs
@@ -4,14 +4,14 @@ using System.Collections.Generic;
 using System.Text;

 using System.IO;

 using System.Xml;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using OpenSim.Framework;

 using OpenSim.Framework.Utilities;

 using OpenSim.Framework.Types;

-using OpenSim.Caches;

+using OpenSim.Region.Caches;

 using libsecondlife;

 

-namespace OpenSim.Region

+namespace OpenSim.Region.Environment

 {

     public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);

 

diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Simulation/EstateManager.cs
index dcb5564..c2c1ecf 100644
--- a/OpenSim/Region/Simulation/EstateManager.cs
+++ b/OpenSim/Region/Simulation/EstateManager.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
 using System.Text;

 using OpenSim.Framework.Types;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Region;

-using OpenSim.Region.Scenes;

+using OpenSim.Region.Environment;

+using OpenSim.Region.Environment.Scenes;

 using OpenSim;

 using libsecondlife;

 using libsecondlife.Packets;

-using Avatar = OpenSim.Region.Scenes.ScenePresence;

+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;

 

 

-namespace OpenSim.Region

+namespace OpenSim.Region.Environment

 {

 

     /// <summary>

diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
index 7811a55..0597857 100644
--- a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,18 +6,21 @@
     <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenSim.Region.Simulation</AssemblyName>

+    <AssemblyName>OpenSim.Region.Environment</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenSim.Region.Simulation</RootNamespace>

-    <StartupObject></StartupObject>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

+    <RootNamespace>OpenSim.Region.Environment</RootNamespace>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,30 +61,31 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="Axiom.MathLib.dll" >

+    <Reference Include="Axiom.MathLib.dll">

       <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="XMLRPC.dll" >

+    <Reference Include="XMLRPC.dll">

       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -88,49 +95,49 @@
       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">

       <Name>OpenSim.Framework.Communications</Name>

       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">

       <Name>OpenSim.Framework.GenericConfig.Xml</Name>

       <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">

       <Name>OpenSim.Framework.Servers</Name>

       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">

       <Name>OpenSim.Region.Caches</Name>

       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">

       <Name>OpenSim.Region.Physics.Manager</Name>

       <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">

       <Name>OpenSim.Region.Terrain.BasicTerrain</Name>

       <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -208,4 +215,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Simulation/ParcelManager.cs
index d15d77d..1cab4ab 100644
--- a/OpenSim/Region/Simulation/ParcelManager.cs
+++ b/OpenSim/Region/Simulation/ParcelManager.cs
@@ -32,10 +32,10 @@ using libsecondlife;
 using libsecondlife.Packets;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

-using OpenSim.Region.Scenes;

-using Avatar = OpenSim.Region.Scenes.ScenePresence;

+using OpenSim.Region.Environment.Scenes;

+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;

 

-namespace OpenSim.Region

+namespace OpenSim.Region.Environment

 {

 

 

@@ -420,7 +420,7 @@ namespace OpenSim.Region
             {

                 for (y = 0; y < inc_y; y++)

                 {

-                    OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);

+                    OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);

                     if (!temp.Contains(currentParcel))

                     {

                         currentParcel.forceUpdateParcelInfo();

diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Simulation/RegionManager.cs
index a317f0f..17d9aad 100644
--- a/OpenSim/Region/Simulation/RegionManager.cs
+++ b/OpenSim/Region/Simulation/RegionManager.cs
@@ -1,12 +1,12 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Communications;

+using OpenSim.Framework.Communications;

 using OpenSim.Framework;

 using OpenSim.Framework.Types;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 

-namespace OpenSim.Region

+namespace OpenSim.Region.Environment

 {

     public class RegionManager //needs renaming , but first we need to rename the namespace

     {

diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Simulation/Scenes/Entity.cs
index f8754f5..bbba34d 100644
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ b/OpenSim/Region/Simulation/Scenes/Entity.cs
@@ -31,9 +31,9 @@ using System.Text;
 using Axiom.MathLib;

 using OpenSim.Physics.Manager;

 using libsecondlife;

-using OpenSim.Region.Scripting;

+using OpenSim.Region.Environment.Scripting;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public abstract class Entity : IScriptReadonlyEntity

     {

diff --git a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
index 65077e6..36023d0 100644
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
@@ -7,7 +7,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public interface IScenePresenceBody

     {

diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Simulation/Scenes/Primitive.cs
index e04c711..0f649b2 100644
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ b/OpenSim/Region/Simulation/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public class Primitive : Entity

     {

@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
             dataArrays.Add(primData.ToBytes());

             foreach (Entity child in children)

             {

-                if (child is OpenSim.Region.Scenes.Primitive)

+                if (child is OpenSim.Region.Environment.Scenes.Primitive)

                 {

-                    dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray());

+                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());

                 }

             }

             byte[] primstart = Helpers.StringToField("<Prim>");

diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
index d1a2717..1d55c4d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public partial class Scene

     {

@@ -218,7 +218,7 @@ namespace OpenSim.Region.Scenes
             {

                 if (ent.LocalId == primLocalID)

                 {

-                    ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient);

+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);

                     break;

                 }

             }

@@ -266,7 +266,7 @@ namespace OpenSim.Region.Scenes
             {

                 if (ent.LocalId == localID)

                 {

-                    ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);

+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);

                     break;

                 }

             }

diff --git a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
index 7b53388..2249c3d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using libsecondlife;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public partial class Scene

     {

diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Simulation/Scenes/Scene.cs
index bf2244e..7e56296 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.cs
@@ -39,14 +39,14 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework;

-using OpenSim.Region.Scripting;

+using OpenSim.Region.Environment.Scripting;

 using OpenSim.Terrain;

-using OpenGrid.Framework.Communications;

-using OpenSim.Caches;

-using OpenSim.Region;

-using OpenSim.Servers;

+using OpenSim.Framework.Communications;

+using OpenSim.Region.Caches;

+using OpenSim.Region.Environment;

+using OpenSim.Framework.Servers;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public delegate bool FilterAvatarList(ScenePresence avatar);

 

@@ -256,7 +256,7 @@ namespace OpenSim.Region.Scenes
                 //Parcel backup routines

                 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];

                 int i = 0;

-                foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)

+                foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values)

                 {

                     parcels[i] = parcel.parcelData;

                     i++;

diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
index 4dbd374..ecd14de 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
@@ -37,11 +37,11 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

-using OpenSim.Region.Scripting;

+using OpenSim.Region.Environment.Scripting;

 using OpenSim.Terrain;

-using OpenSim.Caches;

+using OpenSim.Region.Caches;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public abstract class SceneBase :  IWorld 

     {

diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
index 2898578..fa1bacb 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     /// <summary>

     /// A class for triggering remote scene events.

diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
index 5df87bf..88fb160 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
@@ -35,7 +35,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public class SceneObject : Entity

     {

diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
index f0a8721..2caabc2 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
@@ -31,7 +31,7 @@ using System.Text;
 using libsecondlife;

 using System.Xml;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     partial class ScenePresence

     {

@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
 

                 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");

 

-                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)

+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)

                 {

                     AnimsNames.Add(kp.Value, kp.Key);

                 }

diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
index d21b11f..2c81d2a 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
@@ -34,7 +34,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     partial class ScenePresence

     {

diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
index 45d3fed..96e5c94 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using Axiom.MathLib;

 

-namespace OpenSim.Region.Scenes

+namespace OpenSim.Region.Environment.Scenes

 {

     public partial class ScenePresence : Entity

     {

diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
index daa1b92..eb8a117 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Region.Scripting

+namespace OpenSim.Region.Environment.Scripting

 {

     public interface IScriptContext

     {

diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
index 44b886f..e813626 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Region.Scripting

+namespace OpenSim.Region.Environment.Scripting

 {

     public interface IScriptReadonlyEntity

     {

diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
index 797998d..115b4f4 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
@@ -30,12 +30,12 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 using OpenSim.Physics.Manager;

-using OpenSim.Region;

-using OpenSim.Region.Scenes;

-using Avatar=OpenSim.Region.Scenes.ScenePresence;

-using Primitive = OpenSim.Region.Scenes.Primitive;

+using OpenSim.Region.Environment;

+using OpenSim.Region.Environment.Scenes;

+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;

+using Primitive = OpenSim.Region.Environment.Scenes.Primitive;

 

-namespace OpenSim.Region.Scripting

+namespace OpenSim.Region.Environment.Scripting

 {

     public delegate void ScriptEventHandler(IScriptContext context);

 

diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
index 1d01f3c..5d398b0 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Region.Scripting

+namespace OpenSim.Region.Environment.Scripting

 {

     public class Script

     {

diff --git a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
index 32ef046..0ce65ea 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Region.Scripting

+namespace OpenSim.Region.Environment.Scripting

 {

     public delegate Script ScriptFactory();

 }

diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
index 21f07a8..90c79e3 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenSim.Region.Scripting

+namespace OpenSim.Region.Environment.Scripting

 {

     public class FollowRandomAvatar : Script

     {