diff options
| author | Melanie | 2011-04-17 18:48:53 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-17 18:48:53 +0100 |
| commit | 474910c9d624b53c010232ddb32b4002f58f1de0 (patch) | |
| tree | 45ddab37c6afa0b095ffa0503640b9fe235bc400 /OpenSim/Services/Connectors/Asset | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | More descriptive debug msg for ServiceOSDRequest failures. (diff) | |
| download | opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.zip opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.gz opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.bz2 opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Asset')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index ad18a23..565e4f2 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
| @@ -35,7 +35,6 @@ using Nini.Config; | |||
| 35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| 36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
| 37 | using OpenSim.Framework.Communications; | 37 | using OpenSim.Framework.Communications; |
| 38 | using OpenSim.Framework.Servers.HttpServer; | ||
| 39 | using OpenSim.Services.Interfaces; | 38 | using OpenSim.Services.Interfaces; |
| 40 | using OpenMetaverse; | 39 | using OpenMetaverse; |
| 41 | 40 | ||