diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Tests/Common/Helpers/AssetHelpers.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/AssetHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/AssetHelpers.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs index 7af8bed..974da4c 100644 --- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Tests.Common | |||
66 | { | 66 | { |
67 | return CreateAsset(assetId, AssetType.Notecard, text, UUID.Random()); | 67 | return CreateAsset(assetId, AssetType.Notecard, text, UUID.Random()); |
68 | } | 68 | } |
69 | 69 | ||
70 | // /// <summary> | 70 | // /// <summary> |
71 | // /// Create and store a notecard asset with a random uuid and dummy text. | 71 | // /// Create and store a notecard asset with a random uuid and dummy text. |
72 | // /// </summary> | 72 | // /// </summary> |
@@ -92,7 +92,7 @@ namespace OpenSim.Tests.Common | |||
92 | { | 92 | { |
93 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), sog); | 93 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), sog); |
94 | } | 94 | } |
95 | 95 | ||
96 | /// <summary> | 96 | /// <summary> |
97 | /// Create an asset from the given object. | 97 | /// Create an asset from the given object. |
98 | /// </summary> | 98 | /// </summary> |
@@ -102,12 +102,12 @@ namespace OpenSim.Tests.Common | |||
102 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) | 102 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) |
103 | { | 103 | { |
104 | return CreateAsset( | 104 | return CreateAsset( |
105 | assetUuid, | 105 | assetUuid, |
106 | AssetType.Object, | 106 | AssetType.Object, |
107 | Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), | 107 | Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), |
108 | sog.OwnerID); | 108 | sog.OwnerID); |
109 | } | 109 | } |
110 | 110 | ||
111 | /// <summary> | 111 | /// <summary> |
112 | /// Create an asset from the given scene object. | 112 | /// Create an asset from the given scene object. |
113 | /// </summary> | 113 | /// </summary> |
@@ -120,8 +120,8 @@ namespace OpenSim.Tests.Common | |||
120 | public static AssetBase CreateAsset(int assetUuidTail, CoalescedSceneObjects coa) | 120 | public static AssetBase CreateAsset(int assetUuidTail, CoalescedSceneObjects coa) |
121 | { | 121 | { |
122 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), coa); | 122 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), coa); |
123 | } | 123 | } |
124 | 124 | ||
125 | /// <summary> | 125 | /// <summary> |
126 | /// Create an asset from the given scene object. | 126 | /// Create an asset from the given scene object. |
127 | /// </summary> | 127 | /// </summary> |
@@ -131,12 +131,12 @@ namespace OpenSim.Tests.Common | |||
131 | public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa) | 131 | public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa) |
132 | { | 132 | { |
133 | return CreateAsset( | 133 | return CreateAsset( |
134 | assetUuid, | 134 | assetUuid, |
135 | AssetType.Object, | 135 | AssetType.Object, |
136 | Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), | 136 | Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), |
137 | coa.CreatorId); | 137 | coa.CreatorId); |
138 | } | 138 | } |
139 | 139 | ||
140 | /// <summary> | 140 | /// <summary> |
141 | /// Create an asset from the given data. | 141 | /// Create an asset from the given data. |
142 | /// </summary> | 142 | /// </summary> |
@@ -148,7 +148,7 @@ namespace OpenSim.Tests.Common | |||
148 | 148 | ||
149 | return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); | 149 | return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); |
150 | } | 150 | } |
151 | 151 | ||
152 | /// <summary> | 152 | /// <summary> |
153 | /// Create an asset from the given data. | 153 | /// Create an asset from the given data. |
154 | /// </summary> | 154 | /// </summary> |
@@ -158,9 +158,9 @@ namespace OpenSim.Tests.Common | |||
158 | asset.Data = data; | 158 | asset.Data = data; |
159 | return asset; | 159 | return asset; |
160 | } | 160 | } |
161 | 161 | ||
162 | public static string ReadAssetAsString(IAssetService assetService, UUID uuid) | 162 | public static string ReadAssetAsString(IAssetService assetService, UUID uuid) |
163 | { | 163 | { |
164 | byte[] assetData = assetService.GetData(uuid.ToString()); | 164 | byte[] assetData = assetService.GetData(uuid.ToString()); |
165 | return Encoding.ASCII.GetString(assetData); | 165 | return Encoding.ASCII.GetString(assetData); |
166 | } | 166 | } |