diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs index 4c12967..4386a2d 100644 --- a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs +++ b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs | |||
| @@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.BakedTextures | |||
| 61 | ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args); | 61 | ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args); |
| 62 | 62 | ||
| 63 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); | 63 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); |
| 64 | 64 | ||
| 65 | server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth)); | 65 | server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth)); |
| 66 | server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth)); | 66 | server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth)); |
| 67 | } | 67 | } |