diff options
author | Melanie | 2010-05-21 21:16:04 +0100 |
---|---|---|
committer | Melanie | 2010-05-21 21:16:04 +0100 |
commit | 297bcb5c3d462128c5c81f35aa7a574e567583d5 (patch) | |
tree | be7744848c474a8241f1d1c0e1f0114cfb824e16 /OpenSim/Tests/Common | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.zip opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.gz opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.bz2 opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/AssetHelpers.cs | 22 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index c059969..4984775 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -641,7 +641,7 @@ namespace OpenSim.Tests.Common.Mock | |||
641 | { | 641 | { |
642 | } | 642 | } |
643 | 643 | ||
644 | public void ReprioritizeUpdates(UpdatePriorityHandler handler) | 644 | public void ReprioritizeUpdates() |
645 | { | 645 | { |
646 | } | 646 | } |
647 | 647 | ||
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs index 1fc3cb5..6dc993f 100644 --- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs | |||
@@ -38,12 +38,20 @@ namespace OpenSim.Tests.Common | |||
38 | /// <summary> | 38 | /// <summary> |
39 | /// Create an asset from the given data | 39 | /// Create an asset from the given data |
40 | /// </summary> | 40 | /// </summary> |
41 | public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID) | 41 | public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, byte[] data, UUID creatorID) |
42 | { | 42 | { |
43 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID.ToString()); | 43 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)assetType, creatorID.ToString()); |
44 | asset.Data = Encoding.ASCII.GetBytes(data); | 44 | asset.Data = data; |
45 | return asset; | 45 | return asset; |
46 | } | 46 | } |
47 | |||
48 | /// <summary> | ||
49 | /// Create an asset from the given data | ||
50 | /// </summary> | ||
51 | public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID) | ||
52 | { | ||
53 | return CreateAsset(assetUuid, assetType, Encoding.ASCII.GetBytes(data), creatorID); | ||
54 | } | ||
47 | 55 | ||
48 | /// <summary> | 56 | /// <summary> |
49 | /// Create an asset from the given scene object | 57 | /// Create an asset from the given scene object |
@@ -53,9 +61,11 @@ namespace OpenSim.Tests.Common | |||
53 | /// <returns></returns> | 61 | /// <returns></returns> |
54 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) | 62 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) |
55 | { | 63 | { |
56 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID.ToString()); | 64 | return CreateAsset( |
57 | asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)); | 65 | assetUuid, |
58 | return asset; | 66 | AssetType.Object, |
67 | Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)), | ||
68 | sog.OwnerID); | ||
59 | } | 69 | } |
60 | } | 70 | } |
61 | } | 71 | } |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index ef8ea50..91cf323 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -32,7 +32,6 @@ using Nini.Config; | |||
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications; | 34 | using OpenSim.Framework.Communications; |
35 | |||
36 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Servers.HttpServer; | 37 | using OpenSim.Framework.Servers.HttpServer; |
@@ -115,7 +114,6 @@ namespace OpenSim.Tests.Common.Setup | |||
115 | return SetupScene(name, id, x, y,""); | 114 | return SetupScene(name, id, x, y,""); |
116 | } | 115 | } |
117 | 116 | ||
118 | |||
119 | /// <summary> | 117 | /// <summary> |
120 | /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions | 118 | /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions |
121 | /// or a different, to get a brand new scene with new shared region modules. | 119 | /// or a different, to get a brand new scene with new shared region modules. |