diff options
| author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
| commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
| tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Tests/Common/Setup/AssetHelpers.cs | |
| parent | Merge git://opensimulator.org/git/opensim (diff) | |
| parent | minor: remove mono compiler warnings (diff) | |
| download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz | |
Merge git://opensimulator.org/git/opensim
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 | ||