diff options
| author | Melanie | 2011-03-14 14:48:00 +0000 |
|---|---|---|
| committer | Melanie | 2011-03-14 14:48:00 +0000 |
| commit | 3dc877c59f2e257a07bae6b558bdf79a4cee1de8 (patch) | |
| tree | 7e6ed75f380ca42261e9de0529eb6462bec74db2 /OpenSim/Tests/Common | |
| parent | Up the timeout on slow requests to 3000 to stop console spam. Make sure (diff) | |
| parent | factor inventory file loading into its own method (diff) | |
| download | opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.zip opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.gz opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.bz2 opensim-SC_OLD-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/AssetHelpers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs index 8647cfe..ff4423f 100644 --- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Tests.Common | |||
| 68 | return CreateAsset( | 68 | return CreateAsset( |
| 69 | assetUuid, | 69 | assetUuid, |
| 70 | AssetType.Object, | 70 | AssetType.Object, |
| 71 | Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)), | 71 | Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), |
| 72 | sog.OwnerID); | 72 | sog.OwnerID); |
| 73 | } | 73 | } |
| 74 | 74 | ||