Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

2 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs
index d56e48a..dadf34a 100644
--- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
+++ b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace OpenSim.Framework.Communications.Cache
+namespace OpenSim.Grid.InventoryServer
 {
     public class AuthedSessionCache
     {
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs
index 309c415..f8b4949 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs
@@ -30,8 +30,10 @@ using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Data;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 
-namespace OpenSim.Framework.Communications
+namespace OpenSim.Grid.InventoryServer
 {
     /// <summary>
     /// Abstract base class used by local and grid implementations of an inventory service.