5 files changed, 9 insertions, 10 deletions

diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
index 760c4e8..a02429c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Grid.ScriptServer
+namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
 {
     public abstract class RegionBase
     {
@@ -240,4 +240,4 @@ namespace OpenSim.Grid.ScriptServer
             onhttp_response();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index b815a37..8c31b9b 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -25,9 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Grid.ScriptServer
+namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
 {
-    // Maintains connection and communication to a region
     public class RegionConnectionManager : RegionBase
     {
         private ScriptServerMain m_ScriptServerMain;
@@ -39,4 +38,4 @@ namespace OpenSim.Grid.ScriptServer
             m_Connection = Connection;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index c87352c..8422bea 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -28,10 +28,10 @@
 using System.Collections.Generic;
 using System.Threading;
 using OpenSim.Framework;
+using OpenSim.Grid.ScriptServer.ScriptServer.Region;
 
-namespace OpenSim.Grid.ScriptServer
+namespace OpenSim.Grid.ScriptServer.ScriptServer
 {
-    // Waiting for incoming script requests from region
     internal class RegionCommManager
     {
         private Thread listenThread;
@@ -99,4 +99,4 @@ namespace OpenSim.Grid.ScriptServer
             Regions.Add(new RegionConnectionManager(m_ScriptServerMain, null));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f294dcf..b123b8c 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -34,9 +34,9 @@ using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Data;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.UserManagement;
 
 namespace OpenSim.Grid.UserServer
 {
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index aa2c959..5d0e1d6 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -34,7 +34,7 @@ using libsecondlife;
 using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Framework.UserManagement;
+using OpenSim.Framework.Communications;
 
 namespace OpenSim.Grid.UserServer
 {