diff options
| author | Melanie | 2011-05-05 13:28:15 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-05 13:28:15 +0100 |
| commit | e7e88c4db1088ee2de624ed205d81f5ebfd7245f (patch) | |
| tree | b501cc8d395d4d88a0faea918a965ef0585cce15 /OpenSim | |
| parent | Fix up some paths in prebuild (diff) | |
| parent | Fix up nant linux build break (diff) | |
| download | opensim-SC_OLD-e7e88c4db1088ee2de624ed205d81f5ebfd7245f.zip opensim-SC_OLD-e7e88c4db1088ee2de624ed205d81f5ebfd7245f.tar.gz opensim-SC_OLD-e7e88c4db1088ee2de624ed205d81f5ebfd7245f.tar.bz2 opensim-SC_OLD-e7e88c4db1088ee2de624ed205d81f5ebfd7245f.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs index fa5f755..2ecfa3c 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | |||
| @@ -33,7 +33,6 @@ using OpenSim.Services.Interfaces; | |||
| 33 | using OpenSim.Framework.Servers.HttpServer; | 33 | using OpenSim.Framework.Servers.HttpServer; |
| 34 | using OpenSim.Server.Handlers.Base; | 34 | using OpenSim.Server.Handlers.Base; |
| 35 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
| 36 | using OpenSim.Framework.Servers.HttpServer; | ||
| 37 | 36 | ||
| 38 | using OpenMetaverse; | 37 | using OpenMetaverse; |
| 39 | 38 | ||