diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs index fa0b228..d55e0ff 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs | |||
| @@ -33,6 +33,7 @@ using OpenSim.Framework.Servers.HttpServer; | |||
| 33 | using OpenSim.Server.Handlers.Base; | 33 | using OpenSim.Server.Handlers.Base; |
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | 35 | ||
| 36 | /* | ||
| 36 | namespace OpenSim.Capabilities.Handlers | 37 | namespace OpenSim.Capabilities.Handlers |
| 37 | { | 38 | { |
| 38 | public class GetTextureServerConnector : ServiceConnector | 39 | public class GetTextureServerConnector : ServiceConnector |
| @@ -68,4 +69,5 @@ namespace OpenSim.Capabilities.Handlers | |||
| 68 | new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService, "GetTexture", null, rurl)); | 69 | new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService, "GetTexture", null, rurl)); |
| 69 | } | 70 | } |
| 70 | } | 71 | } |
| 71 | } \ No newline at end of file | 72 | } |
| 73 | */ | ||