diff options
| author | Melanie | 2019-08-07 17:58:55 +0100 |
|---|---|---|
| committer | Melanie | 2019-08-07 17:58:55 +0100 |
| commit | ba680ceecba3dd07fc794a7a2c2a77b2dc9471df (patch) | |
| tree | 0a64eefac9de3746e78c1116b2858d577133773f /OpenSim/Capabilities/Handlers | |
| parent | Fix scope support to get friends list names across co-hosted grids (diff) | |
| parent | cap EstateAccess: don't meed with keepAlive unless needed (diff) | |
| download | opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.zip opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.gz opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.bz2 opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.xz | |
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Capabilities/Handlers')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs index 099c7b4..a5f0056 100644 --- a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs | |||
| @@ -138,8 +138,6 @@ namespace OpenSim.Capabilities.Handlers | |||
| 138 | 138 | ||
| 139 | if(type == AssetType.Mesh || type == AssetType.Texture) | 139 | if(type == AssetType.Mesh || type == AssetType.Texture) |
| 140 | responsedata["throttle"] = true; | 140 | responsedata["throttle"] = true; |
| 141 | // else | ||
| 142 | // m_log.Warn("[GETASSETS]: type: " + query); | ||
| 143 | 141 | ||
| 144 | responsedata["content_type"] = asset.Metadata.ContentType; | 142 | responsedata["content_type"] = asset.Metadata.ContentType; |
| 145 | responsedata["bin_response_data"] = asset.Data; | 143 | responsedata["bin_response_data"] = asset.Data; |