diff options
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs | 3 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 10 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 24 | ||||
-rw-r--r-- | OpenSim/Tests/Performance/NPCPerformanceTests.cs | 2 |
4 files changed, 30 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs index 4a15cf2..5bab62c 100644 --- a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs | |||
@@ -54,9 +54,10 @@ namespace OpenSim.Tests.Common.Mock | |||
54 | return assets.Find(x=>x.FullID == uuid); | 54 | return assets.Find(x=>x.FullID == uuid); |
55 | } | 55 | } |
56 | 56 | ||
57 | public void StoreAsset(AssetBase asset) | 57 | public bool StoreAsset(AssetBase asset) |
58 | { | 58 | { |
59 | assets.Add(asset); | 59 | assets.Add(asset); |
60 | return true; | ||
60 | } | 61 | } |
61 | 62 | ||
62 | public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); } | 63 | public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); } |
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs index ed29c39..5c1ec0b 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
@@ -128,6 +128,11 @@ namespace OpenSim.Data.Null | |||
128 | m_store.RemoveRegionEnvironmentSettings(regionUUID); | 128 | m_store.RemoveRegionEnvironmentSettings(regionUUID); |
129 | } | 129 | } |
130 | 130 | ||
131 | public UUID[] GetObjectIDs(UUID regionID) | ||
132 | { | ||
133 | return new UUID[0]; | ||
134 | } | ||
135 | |||
131 | public void SaveExtra(UUID regionID, string name, string value) | 136 | public void SaveExtra(UUID regionID, string name, string value) |
132 | { | 137 | { |
133 | } | 138 | } |
@@ -332,6 +337,11 @@ namespace OpenSim.Data.Null | |||
332 | { | 337 | { |
333 | } | 338 | } |
334 | 339 | ||
340 | public UUID[] GetObjectIDs(UUID regionID) | ||
341 | { | ||
342 | return new UUID[0]; | ||
343 | } | ||
344 | |||
335 | public void SaveExtra(UUID regionID, string name, string value) | 345 | public void SaveExtra(UUID regionID, string name, string value) |
336 | { | 346 | { |
337 | } | 347 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index f7220d7..df8cf27 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Tests.Common.Mock | |||
72 | public event MoneyTransferRequest OnMoneyTransferRequest; | 72 | public event MoneyTransferRequest OnMoneyTransferRequest; |
73 | public event ParcelBuy OnParcelBuy; | 73 | public event ParcelBuy OnParcelBuy; |
74 | public event Action<IClientAPI> OnConnectionClosed; | 74 | public event Action<IClientAPI> OnConnectionClosed; |
75 | 75 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
76 | public event ImprovedInstantMessage OnInstantMessage; | 76 | public event ImprovedInstantMessage OnInstantMessage; |
77 | public event ChatMessage OnChatFromClient; | 77 | public event ChatMessage OnChatFromClient; |
78 | public event TextureRequest OnRequestTexture; | 78 | public event TextureRequest OnRequestTexture; |
@@ -89,6 +89,7 @@ namespace OpenSim.Tests.Common.Mock | |||
89 | public event ObjectDrop OnObjectDrop; | 89 | public event ObjectDrop OnObjectDrop; |
90 | public event StartAnim OnStartAnim; | 90 | public event StartAnim OnStartAnim; |
91 | public event StopAnim OnStopAnim; | 91 | public event StopAnim OnStopAnim; |
92 | public event ChangeAnim OnChangeAnim; | ||
92 | public event LinkObjects OnLinkObjects; | 93 | public event LinkObjects OnLinkObjects; |
93 | public event DelinkObjects OnDelinkObjects; | 94 | public event DelinkObjects OnDelinkObjects; |
94 | public event RequestMapBlocks OnRequestMapBlocks; | 95 | public event RequestMapBlocks OnRequestMapBlocks; |
@@ -137,6 +138,7 @@ namespace OpenSim.Tests.Common.Mock | |||
137 | public event GenericCall7 OnObjectMaterial; | 138 | public event GenericCall7 OnObjectMaterial; |
138 | public event UpdatePrimFlags OnUpdatePrimFlags; | 139 | public event UpdatePrimFlags OnUpdatePrimFlags; |
139 | public event UpdatePrimTexture OnUpdatePrimTexture; | 140 | public event UpdatePrimTexture OnUpdatePrimTexture; |
141 | public event ClientChangeObject onClientChangeObject; | ||
140 | public event UpdateVector OnUpdatePrimGroupPosition; | 142 | public event UpdateVector OnUpdatePrimGroupPosition; |
141 | public event UpdateVector OnUpdatePrimSinglePosition; | 143 | public event UpdateVector OnUpdatePrimSinglePosition; |
142 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; | 144 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; |
@@ -279,7 +281,7 @@ namespace OpenSim.Tests.Common.Mock | |||
279 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 281 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
280 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 282 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
281 | public event ClassifiedDelete OnClassifiedDelete; | 283 | public event ClassifiedDelete OnClassifiedDelete; |
282 | public event ClassifiedDelete OnClassifiedGodDelete; | 284 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
283 | 285 | ||
284 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 286 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
285 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 287 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -318,11 +320,12 @@ namespace OpenSim.Tests.Common.Mock | |||
318 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 320 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
319 | public event SimWideDeletesDelegate OnSimWideDeletes; | 321 | public event SimWideDeletesDelegate OnSimWideDeletes; |
320 | public event SendPostcard OnSendPostcard; | 322 | public event SendPostcard OnSendPostcard; |
323 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
321 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 324 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
322 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 325 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
323 | public event GodlikeMessage onGodlikeMessage; | 326 | public event GodlikeMessage onGodlikeMessage; |
324 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 327 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
325 | 328 | public event GenericCall2 OnUpdateThrottles; | |
326 | #pragma warning restore 67 | 329 | #pragma warning restore 67 |
327 | 330 | ||
328 | /// <value> | 331 | /// <value> |
@@ -529,6 +532,10 @@ namespace OpenSim.Tests.Common.Mock | |||
529 | { | 532 | { |
530 | } | 533 | } |
531 | 534 | ||
535 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
536 | { | ||
537 | } | ||
538 | |||
532 | public byte[] GetThrottlesPacked(float multiplier) | 539 | public byte[] GetThrottlesPacked(float multiplier) |
533 | { | 540 | { |
534 | return new byte[0]; | 541 | return new byte[0]; |
@@ -701,6 +708,10 @@ namespace OpenSim.Tests.Common.Mock | |||
701 | { | 708 | { |
702 | } | 709 | } |
703 | 710 | ||
711 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
712 | { | ||
713 | } | ||
714 | |||
704 | public virtual void SendRemoveInventoryItem(UUID itemID) | 715 | public virtual void SendRemoveInventoryItem(UUID itemID) |
705 | { | 716 | { |
706 | } | 717 | } |
@@ -717,7 +728,7 @@ namespace OpenSim.Tests.Common.Mock | |||
717 | { | 728 | { |
718 | } | 729 | } |
719 | 730 | ||
720 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 731 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
721 | { | 732 | { |
722 | } | 733 | } |
723 | 734 | ||
@@ -917,10 +928,10 @@ namespace OpenSim.Tests.Common.Mock | |||
917 | 928 | ||
918 | public void Close() | 929 | public void Close() |
919 | { | 930 | { |
920 | Close(false); | 931 | Close(true, false); |
921 | } | 932 | } |
922 | 933 | ||
923 | public void Close(bool force) | 934 | public void Close(bool sendStop, bool force) |
924 | { | 935 | { |
925 | // Fire the callback for this connection closing | 936 | // Fire the callback for this connection closing |
926 | // This is necesary to get the presence detector to notice that a client has logged out. | 937 | // This is necesary to get the presence detector to notice that a client has logged out. |
@@ -1267,6 +1278,5 @@ namespace OpenSim.Tests.Common.Mock | |||
1267 | public void SendPartPhysicsProprieties(ISceneEntity entity) | 1278 | public void SendPartPhysicsProprieties(ISceneEntity entity) |
1268 | { | 1279 | { |
1269 | } | 1280 | } |
1270 | |||
1271 | } | 1281 | } |
1272 | } | 1282 | } |
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs index 2026a88..fde1b91 100644 --- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs +++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs | |||
@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Performance | |||
144 | // ScenePresence.SendInitialData() to reset our entire appearance. | 144 | // ScenePresence.SendInitialData() to reset our entire appearance. |
145 | scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); | 145 | scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); |
146 | 146 | ||
147 | afm.SetAppearance(sp, originalTe, null); | 147 | afm.SetAppearance(sp, originalTe, null, new WearableCacheItem[0]); |
148 | 148 | ||
149 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); | 149 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); |
150 | 150 | ||