5 files changed, 16 insertions, 16 deletions

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs
index 019b65d..514435a 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

-using OpenSim.world;

-using OpenSim.Assets;

+using OpenSim.RegionServer.Simulator;

+using OpenSim.RegionServer.Assets;

 using OpenSim.Framework.Console;

 

-namespace OpenSim

+namespace OpenSim.RegionServer.Client

 {

     public partial class ClientView

     {

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs
index be3a893..4af0485 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

-using OpenSim.world;

-using OpenSim.Assets;

+using OpenSim.RegionServer.Simulator;

+using OpenSim.RegionServer.Assets;

 using OpenSim.Framework.Console;

 

-namespace OpenSim

+namespace OpenSim.RegionServer.Client

 {

     public partial class ClientView

     {

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs
index e3d875f..b07749e 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs
@@ -40,12 +40,11 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

-using OpenSim.world;

-using OpenSim.RegionServer.world;

-using OpenSim.Assets;

+using OpenSim.RegionServer.Simulator;

+using OpenSim.RegionServer.Assets;

 using OpenSim.Framework.Console;

 

-namespace OpenSim

+namespace OpenSim.RegionServer.Client

 {

     public partial class ClientView

     {

@@ -92,6 +91,7 @@ namespace OpenSim
         protected override void ProcessInPacket(Packet Pack)

         {

             ack_pack(Pack);

+            debug = true;

             if (debug)

             {

                 if (Pack.Type != PacketType.AgentUpdate)

@@ -361,7 +361,7 @@ namespace OpenSim
                                             {

                                                 if (ent.localid == updatetask.UpdateData.LocalID)

                                                 {

-                                                    if (ent is OpenSim.world.Primitive)

+                                                    if (ent is OpenSim.RegionServer.Simulator.Primitive)

                                                     {

                                                         this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));

                                                     }

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.cs
index 3934567..6d7c3f2 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.cs
@@ -41,11 +41,11 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

-using OpenSim.world;

-using OpenSim.Assets;

+using OpenSim.RegionServer.Simulator;

+using OpenSim.RegionServer.Assets;

 using OpenSim.Framework.Console;

 

-namespace OpenSim

+namespace OpenSim.RegionServer.Client

 {

     public delegate bool PacketMethod(ClientView simClient, Packet packet);

 

@@ -62,7 +62,7 @@ namespace OpenSim
         public LLUUID SessionID;

         public LLUUID SecureSessionID = LLUUID.Zero;

         public bool m_child;

-        public world.Avatar ClientAvatar;

+        public Simulator.Avatar ClientAvatar;

         private UseCircuitCodePacket cirpack;

         public Thread ClientThread;

         public LLVector3 startpos;

diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs
index 26391a7..2ff245f 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Console;

 

-namespace OpenSim

+namespace OpenSim.RegionServer.Client

 {

     public class ClientViewBase 

     {