diff options
| author | Melanie | 2012-03-14 11:33:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-14 11:33:51 +0000 |
| commit | c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d (patch) | |
| tree | 4b2972bdee4a29c4ecfce11bee9f154c7cdd9873 /OpenSim/Services/Connectors | |
| parent | Implement llSetPrimitiveParams for physics shape and material. Add (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.zip opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.gz opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.bz2 opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 99523a1..6bfc5cc 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
| @@ -477,7 +477,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 477 | // Grab the asset data from the response stream | 477 | // Grab the asset data from the response stream |
| 478 | using (MemoryStream stream = new MemoryStream()) | 478 | using (MemoryStream stream = new MemoryStream()) |
| 479 | { | 479 | { |
| 480 | responseStream.CopyTo(stream, 4096); | 480 | responseStream.CopyStream(stream, Int32.MaxValue); |
| 481 | asset.Data = stream.ToArray(); | 481 | asset.Data = stream.ToArray(); |
| 482 | } | 482 | } |
| 483 | } | 483 | } |