diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
| commit | a7917b428a6bc3c9e33da64879b9e473516540a3 (patch) | |
| tree | 2c38d9c33c4977a3d0356912915082a8bd568a23 /OpenSim/Grid/InventoryServer | |
| parent | Patch from jhurliman to HttpServer (diff) | |
| parent | Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff) | |
| download | opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.zip opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2 opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Grid/InventoryServer/AuthedSessionCache.cs (renamed from OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs) | 2 | ||||
| -rw-r--r-- | OpenSim/Grid/InventoryServer/InventoryServiceBase.cs (renamed from OpenSim/Framework/Communications/InventoryServiceBase.cs) | 4 |
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 @@ | |||
| 28 | using System; | 28 | using System; |
| 29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
| 30 | 30 | ||
| 31 | namespace OpenSim.Framework.Communications.Cache | 31 | namespace OpenSim.Grid.InventoryServer |
| 32 | { | 32 | { |
| 33 | public class AuthedSessionCache | 33 | public class AuthedSessionCache |
| 34 | { | 34 | { |
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; | |||
| 30 | using log4net; | 30 | using log4net; |
| 31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
| 32 | using OpenSim.Data; | 32 | using OpenSim.Data; |
| 33 | using OpenSim.Framework; | ||
| 34 | using OpenSim.Framework.Communications; | ||
| 33 | 35 | ||
| 34 | namespace OpenSim.Framework.Communications | 36 | namespace OpenSim.Grid.InventoryServer |
| 35 | { | 37 | { |
| 36 | /// <summary> | 38 | /// <summary> |
| 37 | /// Abstract base class used by local and grid implementations of an inventory service. | 39 | /// Abstract base class used by local and grid implementations of an inventory service. |