diff options
author | Diva Canto | 2014-05-26 08:13:49 -0700 |
---|---|---|
committer | Diva Canto | 2014-05-26 08:13:49 -0700 |
commit | 449548d7a4e3571597b5e4bec53e3f42ebdf6015 (patch) | |
tree | 4b07ee0bf01968fd77c347818c7c470f2ac1b67f /OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |
parent | Prevent login to a region if the Telehub or Landing Point are in a banned parcel (diff) | |
download | opensim-SC-449548d7a4e3571597b5e4bec53e3f42ebdf6015.zip opensim-SC-449548d7a4e3571597b5e4bec53e3f42ebdf6015.tar.gz opensim-SC-449548d7a4e3571597b5e4bec53e3f42ebdf6015.tar.bz2 opensim-SC-449548d7a4e3571597b5e4bec53e3f42ebdf6015.tar.xz |
Adds an optional redirect URL to the asset server handler for when assets are not found locally.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index df9a51b..ab81dd6 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |||
@@ -70,6 +70,8 @@ namespace OpenSim.Server.Handlers.Asset | |||
70 | bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false); | 70 | bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false); |
71 | bool allowDeleteAllTypes = serverConfig.GetBoolean("AllowRemoteDeleteAllTypes", false); | 71 | bool allowDeleteAllTypes = serverConfig.GetBoolean("AllowRemoteDeleteAllTypes", false); |
72 | 72 | ||
73 | string redirectURL = serverConfig.GetString("RedirectURL", string.Empty); | ||
74 | |||
73 | AllowedRemoteDeleteTypes allowedRemoteDeleteTypes; | 75 | AllowedRemoteDeleteTypes allowedRemoteDeleteTypes; |
74 | 76 | ||
75 | if (!allowDelete) | 77 | if (!allowDelete) |
@@ -86,7 +88,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
86 | 88 | ||
87 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); | 89 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); |
88 | 90 | ||
89 | server.AddStreamHandler(new AssetServerGetHandler(m_AssetService, auth)); | 91 | server.AddStreamHandler(new AssetServerGetHandler(m_AssetService, auth, redirectURL)); |
90 | server.AddStreamHandler(new AssetServerPostHandler(m_AssetService, auth)); | 92 | server.AddStreamHandler(new AssetServerPostHandler(m_AssetService, auth)); |
91 | server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowedRemoteDeleteTypes, auth)); | 93 | server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowedRemoteDeleteTypes, auth)); |
92 | server.AddStreamHandler(new AssetsExistHandler(m_AssetService)); | 94 | server.AddStreamHandler(new AssetsExistHandler(m_AssetService)); |