diff options
| author | BlueWall | 2011-03-21 22:06:43 -0400 |
|---|---|---|
| committer | BlueWall | 2011-03-21 22:06:43 -0400 |
| commit | e3c327a305dcf795f372b940f34538a19bf92218 (patch) | |
| tree | b034355a12c4d87410809aa19bf6015e611e1e22 /OpenSim/Tests/Common/Setup/AssetHelpers.cs | |
| parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
| parent | Thanks Kevin Cozens for a patch that: (diff) | |
| download | opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.zip opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.gz opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.bz2 opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.xz | |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Tests/Common/Setup/AssetHelpers.cs')
| -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 | ||