From e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 16:39:11 +0000
Subject: *Some more restructuring/fixing -- should compile, but high chance I
 forgot to add/remove something

---
 OpenSim/Region/ClientStack/Assets/InventoryCache.cs       | 1 +
 OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs   | 2 +-
 OpenSim/Region/ClientStack/ClientView.API.cs              | 2 +-
 OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs | 4 ++--
 OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs   | 2 +-
 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs   | 2 +-
 OpenSim/Region/ClientStack/ClientView.cs                  | 4 ++--
 OpenSim/Region/ClientStack/ClientViewBase.cs              | 2 +-
 OpenSim/Region/ClientStack/PacketServer.cs                | 4 ++--
 OpenSim/Region/ClientStack/RegionApplicationBase.cs       | 5 ++---
 OpenSim/Region/ClientStack/UDPServer.cs                   | 7 +++----
 OpenSim/Region/ClientStack/VersionInfo.cs                 | 2 +-
 12 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 5d5021c..da74f85 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Region.ClientStack;
 
 namespace OpenSim.Assets
 {
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index 7552195..f99cf79 100644
--- a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
 using libsecondlife;
 
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
 
     public interface ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 902f3c7..5e346fb 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Types;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 914c38a..bc6cc21 100644
--- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -32,11 +32,11 @@ using OpenSim.Assets;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 32aed02..cbd10dc 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 191ef21..51981b8 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 312da9d..9c4462d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -42,9 +42,9 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public delegate bool PacketMethod(ClientView simClient, Packet packet);
 
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 8b503f0..7d39405 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -39,7 +39,7 @@ using System.Timers;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Interfaces;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public class ClientViewBase 
     {
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 229570c..ffd254e 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -34,9 +34,9 @@ using OpenSim.Framework;
 using System.Net;
 using System.Net.Sockets;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public class PacketServer
     {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index b421fbd..d39adb5 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -42,14 +42,13 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Physics.Manager;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.GenericConfig;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public class RegionApplicationBase
     {
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f2a02d9..33097ed 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -41,14 +41,13 @@ using OpenSim.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework;
 using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
+using OpenSim.Framework.Servers;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
 
     public class UDPServer : ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
index 5d1354e..249ca94 100644
--- a/OpenSim/Region/ClientStack/VersionInfo.cs
+++ b/OpenSim/Region/ClientStack/VersionInfo.cs
@@ -27,7 +27,7 @@
 */
 using System;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     /// <summary>
     /// </summary>
-- 
cgit v1.1