diff options
Diffstat (limited to '')
-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 | 26 | ||||
-rw-r--r-- | OpenSim/Tests/Performance/NPCPerformanceTests.cs | 2 |
4 files changed, 32 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 d26e3f7..07de06c 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Tests.Common.Mock | |||
71 | public event MoneyTransferRequest OnMoneyTransferRequest; | 71 | public event MoneyTransferRequest OnMoneyTransferRequest; |
72 | public event ParcelBuy OnParcelBuy; | 72 | public event ParcelBuy OnParcelBuy; |
73 | public event Action<IClientAPI> OnConnectionClosed; | 73 | public event Action<IClientAPI> OnConnectionClosed; |
74 | 74 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
75 | public event ImprovedInstantMessage OnInstantMessage; | 75 | public event ImprovedInstantMessage OnInstantMessage; |
76 | public event ChatMessage OnChatFromClient; | 76 | public event ChatMessage OnChatFromClient; |
77 | public event TextureRequest OnRequestTexture; | 77 | public event TextureRequest OnRequestTexture; |
@@ -88,6 +88,7 @@ namespace OpenSim.Tests.Common.Mock | |||
88 | public event ObjectDrop OnObjectDrop; | 88 | public event ObjectDrop OnObjectDrop; |
89 | public event StartAnim OnStartAnim; | 89 | public event StartAnim OnStartAnim; |
90 | public event StopAnim OnStopAnim; | 90 | public event StopAnim OnStopAnim; |
91 | public event ChangeAnim OnChangeAnim; | ||
91 | public event LinkObjects OnLinkObjects; | 92 | public event LinkObjects OnLinkObjects; |
92 | public event DelinkObjects OnDelinkObjects; | 93 | public event DelinkObjects OnDelinkObjects; |
93 | public event RequestMapBlocks OnRequestMapBlocks; | 94 | public event RequestMapBlocks OnRequestMapBlocks; |
@@ -135,6 +136,7 @@ namespace OpenSim.Tests.Common.Mock | |||
135 | public event GenericCall7 OnObjectMaterial; | 136 | public event GenericCall7 OnObjectMaterial; |
136 | public event UpdatePrimFlags OnUpdatePrimFlags; | 137 | public event UpdatePrimFlags OnUpdatePrimFlags; |
137 | public event UpdatePrimTexture OnUpdatePrimTexture; | 138 | public event UpdatePrimTexture OnUpdatePrimTexture; |
139 | public event ClientChangeObject onClientChangeObject; | ||
138 | public event UpdateVector OnUpdatePrimGroupPosition; | 140 | public event UpdateVector OnUpdatePrimGroupPosition; |
139 | public event UpdateVector OnUpdatePrimSinglePosition; | 141 | public event UpdateVector OnUpdatePrimSinglePosition; |
140 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; | 142 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; |
@@ -276,7 +278,7 @@ namespace OpenSim.Tests.Common.Mock | |||
276 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 278 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
277 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 279 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
278 | public event ClassifiedDelete OnClassifiedDelete; | 280 | public event ClassifiedDelete OnClassifiedDelete; |
279 | public event ClassifiedDelete OnClassifiedGodDelete; | 281 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
280 | 282 | ||
281 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 283 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
282 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 284 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -315,11 +317,12 @@ namespace OpenSim.Tests.Common.Mock | |||
315 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 317 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
316 | public event SimWideDeletesDelegate OnSimWideDeletes; | 318 | public event SimWideDeletesDelegate OnSimWideDeletes; |
317 | public event SendPostcard OnSendPostcard; | 319 | public event SendPostcard OnSendPostcard; |
320 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
318 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 321 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
319 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 322 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
320 | public event GodlikeMessage onGodlikeMessage; | 323 | public event GodlikeMessage onGodlikeMessage; |
321 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 324 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
322 | 325 | public event GenericCall2 OnUpdateThrottles; | |
323 | #pragma warning restore 67 | 326 | #pragma warning restore 67 |
324 | 327 | ||
325 | /// <value> | 328 | /// <value> |
@@ -520,6 +523,12 @@ namespace OpenSim.Tests.Common.Mock | |||
520 | public virtual void SetChildAgentThrottle(byte[] throttle) | 523 | public virtual void SetChildAgentThrottle(byte[] throttle) |
521 | { | 524 | { |
522 | } | 525 | } |
526 | |||
527 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
528 | { | ||
529 | |||
530 | |||
531 | } | ||
523 | public byte[] GetThrottlesPacked(float multiplier) | 532 | public byte[] GetThrottlesPacked(float multiplier) |
524 | { | 533 | { |
525 | return new byte[0]; | 534 | return new byte[0]; |
@@ -692,6 +701,10 @@ namespace OpenSim.Tests.Common.Mock | |||
692 | { | 701 | { |
693 | } | 702 | } |
694 | 703 | ||
704 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
705 | { | ||
706 | } | ||
707 | |||
695 | public virtual void SendRemoveInventoryItem(UUID itemID) | 708 | public virtual void SendRemoveInventoryItem(UUID itemID) |
696 | { | 709 | { |
697 | } | 710 | } |
@@ -708,7 +721,7 @@ namespace OpenSim.Tests.Common.Mock | |||
708 | { | 721 | { |
709 | } | 722 | } |
710 | 723 | ||
711 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 724 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
712 | { | 725 | { |
713 | } | 726 | } |
714 | 727 | ||
@@ -913,10 +926,10 @@ namespace OpenSim.Tests.Common.Mock | |||
913 | 926 | ||
914 | public void Close() | 927 | public void Close() |
915 | { | 928 | { |
916 | Close(false); | 929 | Close(true, false); |
917 | } | 930 | } |
918 | 931 | ||
919 | public void Close(bool force) | 932 | public void Close(bool sendStop, bool force) |
920 | { | 933 | { |
921 | // Fire the callback for this connection closing | 934 | // Fire the callback for this connection closing |
922 | // This is necesary to get the presence detector to notice that a client has logged out. | 935 | // This is necesary to get the presence detector to notice that a client has logged out. |
@@ -1263,6 +1276,5 @@ namespace OpenSim.Tests.Common.Mock | |||
1263 | public void SendPartPhysicsProprieties(ISceneEntity entity) | 1276 | public void SendPartPhysicsProprieties(ISceneEntity entity) |
1264 | { | 1277 | { |
1265 | } | 1278 | } |
1266 | |||
1267 | } | 1279 | } |
1268 | } | 1280 | } |
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 | ||