diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Tests/Common | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 13 | ||||
-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 | 46 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestLandChannel.cs | 1 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 3 |
7 files changed, 69 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs index cf7583e..e6adcf7 100644 --- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | |||
@@ -120,4 +120,4 @@ namespace OpenSim.Tests.Common | |||
120 | }; | 120 | }; |
121 | } | 121 | } |
122 | } | 122 | } |
123 | } \ No newline at end of file | 123 | } |
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 1fb1c5c..9ed3eae 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -152,13 +152,22 @@ namespace OpenSim.Tests.Common | |||
152 | 152 | ||
153 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 153 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
154 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | 154 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); |
155 | <<<<<<< HEAD | ||
155 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | 156 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); |
156 | PhysicsScene physicsScene | 157 | PhysicsScene physicsScene |
158 | ======= | ||
159 | Vector3 regionExtent = new Vector3(regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | ||
160 | PhysicsScene physicsScene | ||
161 | >>>>>>> avn/ubitvar | ||
157 | = physicsPluginManager.GetPhysicsScene( | 162 | = physicsPluginManager.GetPhysicsScene( |
158 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); | 163 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); |
159 | 164 | ||
160 | TestScene testScene = new TestScene( | 165 | TestScene testScene = new TestScene( |
166 | <<<<<<< HEAD | ||
161 | regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); | 167 | regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); |
168 | ======= | ||
169 | regInfo, m_acm, physicsScene, scs, m_simDataService, m_estateDataService, configSource, null); | ||
170 | >>>>>>> avn/ubitvar | ||
162 | 171 | ||
163 | INonSharedRegionModule godsModule = new GodsModule(); | 172 | INonSharedRegionModule godsModule = new GodsModule(); |
164 | godsModule.Initialise(new IniConfigSource()); | 173 | godsModule.Initialise(new IniConfigSource()); |
@@ -201,7 +210,11 @@ namespace OpenSim.Tests.Common | |||
201 | testScene.SetModuleInterfaces(); | 210 | testScene.SetModuleInterfaces(); |
202 | 211 | ||
203 | testScene.LandChannel = new TestLandChannel(testScene); | 212 | testScene.LandChannel = new TestLandChannel(testScene); |
213 | <<<<<<< HEAD | ||
204 | testScene.LoadWorldMap(); | 214 | testScene.LoadWorldMap(); |
215 | ======= | ||
216 | testScene.LoadWorldMap(); | ||
217 | >>>>>>> avn/ubitvar | ||
205 | 218 | ||
206 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 219 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
207 | testScene.LoginsEnabled = true; | 220 | testScene.LoginsEnabled = true; |
diff --git a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs index dddf75d..aaf61e7 100644 --- a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs | |||
@@ -54,9 +54,10 @@ namespace OpenSim.Tests.Common | |||
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 5df8e04..3ab9020 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
@@ -138,6 +138,11 @@ namespace OpenSim.Data.Null | |||
138 | m_store.RemoveRegionEnvironmentSettings(regionUUID); | 138 | m_store.RemoveRegionEnvironmentSettings(regionUUID); |
139 | } | 139 | } |
140 | 140 | ||
141 | public UUID[] GetObjectIDs(UUID regionID) | ||
142 | { | ||
143 | return new UUID[0]; | ||
144 | } | ||
145 | |||
141 | public void SaveExtra(UUID regionID, string name, string value) | 146 | public void SaveExtra(UUID regionID, string name, string value) |
142 | { | 147 | { |
143 | } | 148 | } |
@@ -355,6 +360,11 @@ namespace OpenSim.Data.Null | |||
355 | { | 360 | { |
356 | } | 361 | } |
357 | 362 | ||
363 | public UUID[] GetObjectIDs(UUID regionID) | ||
364 | { | ||
365 | return new UUID[0]; | ||
366 | } | ||
367 | |||
358 | public void SaveExtra(UUID regionID, string name, string value) | 368 | public void SaveExtra(UUID regionID, string name, string value) |
359 | { | 369 | { |
360 | } | 370 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 0e1bc8f..f034443 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Tests.Common | |||
88 | public event MoneyTransferRequest OnMoneyTransferRequest; | 88 | public event MoneyTransferRequest OnMoneyTransferRequest; |
89 | public event ParcelBuy OnParcelBuy; | 89 | public event ParcelBuy OnParcelBuy; |
90 | public event Action<IClientAPI> OnConnectionClosed; | 90 | public event Action<IClientAPI> OnConnectionClosed; |
91 | 91 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
92 | public event ImprovedInstantMessage OnInstantMessage; | 92 | public event ImprovedInstantMessage OnInstantMessage; |
93 | public event ChatMessage OnChatFromClient; | 93 | public event ChatMessage OnChatFromClient; |
94 | public event TextureRequest OnRequestTexture; | 94 | public event TextureRequest OnRequestTexture; |
@@ -105,6 +105,7 @@ namespace OpenSim.Tests.Common | |||
105 | public event ObjectDrop OnObjectDrop; | 105 | public event ObjectDrop OnObjectDrop; |
106 | public event StartAnim OnStartAnim; | 106 | public event StartAnim OnStartAnim; |
107 | public event StopAnim OnStopAnim; | 107 | public event StopAnim OnStopAnim; |
108 | public event ChangeAnim OnChangeAnim; | ||
108 | public event LinkObjects OnLinkObjects; | 109 | public event LinkObjects OnLinkObjects; |
109 | public event DelinkObjects OnDelinkObjects; | 110 | public event DelinkObjects OnDelinkObjects; |
110 | public event RequestMapBlocks OnRequestMapBlocks; | 111 | public event RequestMapBlocks OnRequestMapBlocks; |
@@ -153,6 +154,7 @@ namespace OpenSim.Tests.Common | |||
153 | public event GenericCall7 OnObjectMaterial; | 154 | public event GenericCall7 OnObjectMaterial; |
154 | public event UpdatePrimFlags OnUpdatePrimFlags; | 155 | public event UpdatePrimFlags OnUpdatePrimFlags; |
155 | public event UpdatePrimTexture OnUpdatePrimTexture; | 156 | public event UpdatePrimTexture OnUpdatePrimTexture; |
157 | public event ClientChangeObject onClientChangeObject; | ||
156 | public event UpdateVector OnUpdatePrimGroupPosition; | 158 | public event UpdateVector OnUpdatePrimGroupPosition; |
157 | public event UpdateVector OnUpdatePrimSinglePosition; | 159 | public event UpdateVector OnUpdatePrimSinglePosition; |
158 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; | 160 | public event UpdatePrimRotation OnUpdatePrimGroupRotation; |
@@ -295,7 +297,7 @@ namespace OpenSim.Tests.Common | |||
295 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; | 297 | public event ClassifiedInfoRequest OnClassifiedInfoRequest; |
296 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; | 298 | public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; |
297 | public event ClassifiedDelete OnClassifiedDelete; | 299 | public event ClassifiedDelete OnClassifiedDelete; |
298 | public event ClassifiedDelete OnClassifiedGodDelete; | 300 | public event ClassifiedGodDelete OnClassifiedGodDelete; |
299 | 301 | ||
300 | public event EventNotificationAddRequest OnEventNotificationAddRequest; | 302 | public event EventNotificationAddRequest OnEventNotificationAddRequest; |
301 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; | 303 | public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; |
@@ -334,11 +336,12 @@ namespace OpenSim.Tests.Common | |||
334 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 336 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
335 | public event SimWideDeletesDelegate OnSimWideDeletes; | 337 | public event SimWideDeletesDelegate OnSimWideDeletes; |
336 | public event SendPostcard OnSendPostcard; | 338 | public event SendPostcard OnSendPostcard; |
339 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
337 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 340 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
338 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 341 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
339 | public event GodlikeMessage onGodlikeMessage; | 342 | public event GodlikeMessage onGodlikeMessage; |
340 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 343 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
341 | 344 | public event GenericCall2 OnUpdateThrottles; | |
342 | #pragma warning restore 67 | 345 | #pragma warning restore 67 |
343 | 346 | ||
344 | /// <value> | 347 | /// <value> |
@@ -387,6 +390,8 @@ namespace OpenSim.Tests.Common | |||
387 | get { return FirstName + " " + LastName; } | 390 | get { return FirstName + " " + LastName; } |
388 | } | 391 | } |
389 | 392 | ||
393 | public int PingTimeMS { get { return 0; } } | ||
394 | |||
390 | public bool IsActive | 395 | public bool IsActive |
391 | { | 396 | { |
392 | get { return true; } | 397 | get { return true; } |
@@ -448,6 +453,8 @@ namespace OpenSim.Tests.Common | |||
448 | get { return new IPEndPoint(IPAddress.Loopback, (ushort)m_circuitCode); } | 453 | get { return new IPEndPoint(IPAddress.Loopback, (ushort)m_circuitCode); } |
449 | } | 454 | } |
450 | 455 | ||
456 | public List<uint> SelectedObjects {get; private set;} | ||
457 | |||
451 | /// <summary> | 458 | /// <summary> |
452 | /// Constructor | 459 | /// Constructor |
453 | /// </summary> | 460 | /// </summary> |
@@ -570,10 +577,27 @@ namespace OpenSim.Tests.Common | |||
570 | ReceivedKills.AddRange(localID); | 577 | ReceivedKills.AddRange(localID); |
571 | } | 578 | } |
572 | 579 | ||
580 | public void SendPartFullUpdate(ISceneEntity ent, uint? parentID) | ||
581 | { | ||
582 | } | ||
583 | |||
573 | public virtual void SetChildAgentThrottle(byte[] throttle) | 584 | public virtual void SetChildAgentThrottle(byte[] throttle) |
574 | { | 585 | { |
575 | } | 586 | } |
576 | 587 | ||
588 | public virtual void SetChildAgentThrottle(byte[] throttle, float factor) | ||
589 | { | ||
590 | } | ||
591 | |||
592 | public void SetAgentThrottleSilent(int throttle, int setting) | ||
593 | { | ||
594 | } | ||
595 | |||
596 | public int GetAgentThrottleSilent(int throttle) | ||
597 | { | ||
598 | return 0; | ||
599 | } | ||
600 | |||
577 | public byte[] GetThrottlesPacked(float multiplier) | 601 | public byte[] GetThrottlesPacked(float multiplier) |
578 | { | 602 | { |
579 | return new byte[0]; | 603 | return new byte[0]; |
@@ -608,6 +632,11 @@ namespace OpenSim.Tests.Common | |||
608 | 632 | ||
609 | } | 633 | } |
610 | 634 | ||
635 | public virtual bool CanSendLayerData() | ||
636 | { | ||
637 | return false; | ||
638 | } | ||
639 | |||
611 | public virtual void SendLayerData(float[] map) | 640 | public virtual void SendLayerData(float[] map) |
612 | { | 641 | { |
613 | } | 642 | } |
@@ -755,6 +784,10 @@ namespace OpenSim.Tests.Common | |||
755 | { | 784 | { |
756 | } | 785 | } |
757 | 786 | ||
787 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
788 | { | ||
789 | } | ||
790 | |||
758 | public virtual void SendRemoveInventoryItem(UUID itemID) | 791 | public virtual void SendRemoveInventoryItem(UUID itemID) |
759 | { | 792 | { |
760 | } | 793 | } |
@@ -771,7 +804,7 @@ namespace OpenSim.Tests.Common | |||
771 | { | 804 | { |
772 | } | 805 | } |
773 | 806 | ||
774 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 807 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
775 | { | 808 | { |
776 | } | 809 | } |
777 | 810 | ||
@@ -966,10 +999,10 @@ namespace OpenSim.Tests.Common | |||
966 | 999 | ||
967 | public void Close() | 1000 | public void Close() |
968 | { | 1001 | { |
969 | Close(false); | 1002 | Close(true, false); |
970 | } | 1003 | } |
971 | 1004 | ||
972 | public void Close(bool force) | 1005 | public void Close(bool sendStop, bool force) |
973 | { | 1006 | { |
974 | // Fire the callback for this connection closing | 1007 | // Fire the callback for this connection closing |
975 | // This is necesary to get the presence detector to notice that a client has logged out. | 1008 | // This is necesary to get the presence detector to notice that a client has logged out. |
@@ -1318,6 +1351,5 @@ namespace OpenSim.Tests.Common | |||
1318 | public void SendPartPhysicsProprieties(ISceneEntity entity) | 1351 | public void SendPartPhysicsProprieties(ISceneEntity entity) |
1319 | { | 1352 | { |
1320 | } | 1353 | } |
1321 | |||
1322 | } | 1354 | } |
1323 | } | 1355 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs index 89ebcd5..23258ad 100644 --- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs +++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs | |||
@@ -111,5 +111,6 @@ namespace OpenSim.Tests.Common | |||
111 | 111 | ||
112 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} | 112 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} |
113 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} | 113 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {} |
114 | public void sendClientInitialLandInfo(IClientAPI remoteClient) { } | ||
114 | } | 115 | } |
115 | } \ No newline at end of file | 116 | } \ No newline at end of file |
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 45acf91..e559871 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -34,7 +34,10 @@ using OpenSim.Region.Framework; | |||
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Physics.Manager; | 36 | using OpenSim.Region.Physics.Manager; |
37 | <<<<<<< HEAD | ||
37 | using OpenSim.Services.Interfaces; | 38 | using OpenSim.Services.Interfaces; |
39 | ======= | ||
40 | >>>>>>> avn/ubitvar | ||
38 | 41 | ||
39 | namespace OpenSim.Tests.Common | 42 | namespace OpenSim.Tests.Common |
40 | { | 43 | { |