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/Framework/AssetRequestToClient.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/Framework/AssetRequestToClient.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs index d602c1f..3dfbb91 100644 --- a/OpenSim/Framework/AssetRequestToClient.cs +++ b/OpenSim/Framework/AssetRequestToClient.cs | |||
| @@ -31,10 +31,10 @@ namespace OpenSim.Framework | |||
| 31 | { | 31 | { |
| 32 | /// <summary> | 32 | /// <summary> |
| 33 | /// This class was created to refactor OutPacket out of AssetCache | 33 | /// This class was created to refactor OutPacket out of AssetCache |
| 34 | /// There is a conflict between | 34 | /// There is a conflict between |
| 35 | /// OpenSim.Framework.Communications.Cache.AssetRequest and OpenSim.Framework.AssetRequest | 35 | /// OpenSim.Framework.Communications.Cache.AssetRequest and OpenSim.Framework.AssetRequest |
| 36 | /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring | 36 | /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring |
| 37 | /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache | 37 | /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache |
| 38 | /// requiring OpenSim.Framework | 38 | /// requiring OpenSim.Framework |
| 39 | /// </summary> | 39 | /// </summary> |
| 40 | public class AssetRequestToClient | 40 | public class AssetRequestToClient |