Melanie
236e1c45f2
Merge branch 'master' into careminster
2012-02-07 23:30:48 +00:00
Justin Clark-Casey (justincc)
c87751a822
Add start GC memory and end GC memory to object stress test printouts.
...
This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general).
This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
2012-02-07 23:03:53 +00:00
Justin Clark-Casey (justincc)
bd928218dd
Add TestAddTaskInventoryItem()
2012-02-07 21:00:47 +00:00
Melanie
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
Justin Clark-Casey (justincc)
c22970448f
Add TestCompileAndStart100Scripts() torture test.
2012-02-07 19:42:32 +00:00
Justin Clark-Casey (justincc)
038d1bf742
Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().
...
The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
2012-02-07 17:44:37 +00:00
Melanie
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
PixelTomsen
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-03 18:02:51 -05:00
Melanie
bce5dfe711
Merge branch 'master' into careminster
2012-02-03 00:09:05 +00:00
Melanie
76a658324c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-03 00:07:23 +00:00
Melanie
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
Melanie
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
Justin Clark-Casey (justincc)
17df4185ce
Add stress tests for simple object add of 100 prim objects. Add time taken to output (this is unreliable).
2012-02-02 18:42:27 +00:00
Melanie
1b63b21a4d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-01-31 20:53:49 +00:00
Justin Clark-Casey (justincc)
f3780b9eae
Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.
...
These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
2012-01-31 19:56:37 +00:00
Melanie
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
BlueWall
590f707c42
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-20 23:54:29 -05:00
BlueWall
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
Justin Clark-Casey (justincc)
d38e2c0c91
Add image not in database test for LLImageManager
2012-01-19 21:57:12 +00:00
Justin Clark-Casey (justincc)
9356963bd3
Add basic request and send image regression tests for LLImageManager
2012-01-19 19:00:11 +00:00
Melanie
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
Melanie
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
Justin Clark-Casey (justincc)
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
Melanie
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
Melanie
28da235888
Merge branch 'master' into bigmerge
2011-12-06 19:01:05 +00:00
Justin Clark-Casey (justincc)
319507f521
Add test for not found response from GetTexture cap handler.
...
Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
2011-12-05 21:04:17 +00:00
Justin Clark-Casey (justincc)
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
Melanie
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
Melanie
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
Melanie
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
Justin Clark-Casey (justincc)
a82aea53f8
Split up test SceneHelpers to provide an AddChildScenePresence() call
2011-12-03 19:32:59 +00:00
Justin Clark-Casey (justincc)
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
2011-12-03 18:59:54 +00:00
Melanie
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
BlueWall
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
Melanie
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
89632f3ea8
Add test for removing a friendship.
2011-11-14 20:56:56 +00:00
Melanie
afca742392
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
Justin Clark-Casey (justincc)
de895ee54a
Add very simple FriendsModuleTests.TestNoFriends()
2011-11-14 17:18:51 +00:00
Melanie
c7dd7b13a2
Convert SendKillObject to take a list of uint rather than sending one
...
packet per prim. More to come as we change to make use of this.
2011-11-06 20:38:07 +00:00
Melanie
02f0aa592d
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
2011-10-25 03:19:10 +01:00
Melanie
8639b037e1
Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge
2011-10-25 03:18:59 +01:00
Melanie
de8cdbda15
Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge
2011-10-25 03:18:53 +01:00
Melanie
be2cfeb5c3
Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge
2011-10-25 03:18:49 +01:00
Melanie
da805d0cce
Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge
2011-10-25 03:18:38 +01:00
Melanie
56f3da7b5a
Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge
2011-10-25 03:18:29 +01:00
Melanie
dc24ac4f20
Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge
2011-10-25 02:54:34 +01:00
Melanie
353f0c0e03
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 02:14:39 +01:00
Melanie
f50538c81a
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-25 01:55:01 +01:00
Melanie
2895789bd0
Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge
2011-10-25 01:51:24 +01:00
Justin Clark-Casey (justincc)
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
...
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-22 02:16:46 +01:00
Justin Clark-Casey (justincc)
30320505fa
redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we can comment out some inconsistency
2011-10-22 00:58:56 +01:00
Justin Clark-Casey (justincc)
bc2da4eaad
correct misleading method doc on CreateNotecardAsset()
2011-10-22 00:55:50 +01:00
Justin Clark-Casey (justincc)
c4f8da7359
in AssetHelpers, store the actual text passed in to the method, not the string "data"
2011-10-22 00:45:47 +01:00
Justin Clark-Casey (justincc)
5d7eaedbeb
encode notecard assets in proper format for tests, rather than just using whatever string is given
2011-10-22 00:21:45 +01:00
Justin Clark-Casey (justincc)
9b3bbedeea
refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()
2011-10-22 00:13:46 +01:00
Justin Clark-Casey (justincc)
120114e96b
refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter
2011-10-17 20:50:29 +01:00
Justin Clark-Casey (justincc)
ddf54b5537
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
Justin Clark-Casey (justincc)
528cc8136e
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
2011-10-15 02:54:43 +01:00
Justin Clark-Casey (justincc)
aa19ccf65c
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
2011-10-14 01:45:46 +01:00
Melanie
652c59c0a9
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
2011-10-11 22:42:18 +01:00
Melanie
6101de2316
Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:32:10 +01:00
Justin Clark-Casey (justincc)
d358125cac
Reinstate option to land an npc when it reaches a target.
...
This is moved into ScenePresence for now as a general facility
2011-09-22 00:16:05 +01:00
Justin Clark-Casey (justincc)
8159fd7110
When calling osNpcMoveTo(), rotate the avatar in the direction of travel.
...
This stops the npc walking backwards if the target is directly behind.
This means that the npc no longer returns to its original rotation once movement has finished.
If you want this behaviour, please store and reset the original rotation after movement.
This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678
2011-09-21 19:28:41 +01:00
Tom
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
Justin Clark-Casey (justincc)
42790f021f
Fix unit tests from RegionSettings commit
2011-09-09 00:47:23 +01:00
Justin Clark-Casey (justincc)
bd5d2cb043
Use scene presence agent id for rezzed object ownership rather than item owner.
...
These should be identical. However, the item isn't available when rezzing npc attachments.
2011-09-08 20:51:52 +01:00
Tom
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
899d109e82
get rid of appearance null checks - this is never null
2011-08-31 17:13:53 +01:00
Justin Clark-Casey (justincc)
be357f8fee
Fix bug in persisting saved appearances for npcs
...
Assets have to be marked non-local as well as non-temporary to persist. This is now done.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
2011-08-30 01:58:32 +01:00
Justin Clark-Casey (justincc)
c9e6b7bd10
Stop NPC's getting hypergrid like names in some circumstances.
...
This meant punching in another AddUser() method in IUserManagement to do a direct name to UUID associated without the account check (since NPCs don't have accounts).
May address http://opensimulator.org/mantis/view.php?id=5645
2011-08-19 00:45:22 +01:00
Justin Clark-Casey (justincc)
c1a34cd8da
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
...
This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc.
This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
2011-08-18 00:53:05 +01:00
Justin Clark-Casey (justincc)
696bd44833
Add new regression TestRezAttachmentsOnAvatarEntrance() to do simple attachments check
2011-08-17 00:37:33 +01:00
Justin Clark-Casey (justincc)
5d6c9644fa
early code to allow scripts to force npcs not to fly when moving to target
...
this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path.
currently implemented in osNpcMoveToTarget(), but none of this is final.
2011-08-10 01:47:37 +01:00
Justin Clark-Casey (justincc)
4cb8d6379d
Stop trying to deregister caps or close child agents when an NPC is removed
2011-08-10 00:59:31 +01:00
Justin Clark-Casey (justincc)
92e96d394a
When an NPC is created, stop telling neighbouring regions to expect a child agent
2011-08-09 23:11:07 +01:00
Justin Clark-Casey (justincc)
85e07c78fb
refactor: Change SceneHelpers.AddClient() to AddScenePresence().
...
This seems to make more sense as we can get SP.ControllingClient
2011-08-06 02:17:41 +01:00
Justin Clark-Casey (justincc)
dad1d6df18
rename TestHelper => TestHelpers for consistency
2011-08-06 00:31:03 +01:00
Justin Clark-Casey (justincc)
bda1a4be45
rename test SceneSetupHelpers -> SceneHelpers for consistency
2011-08-06 00:26:37 +01:00
Justin Clark-Casey (justincc)
2964467708
get rid of vestigal move to parameters
2011-08-03 22:11:05 +01:00
Justin Clark-Casey (justincc)
59f548cda8
Get osNpcCreate appearance working with avatars that are currently in the scene.
...
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing).
Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing.
Extended TestCreate() to check this.
2011-08-01 23:41:29 +01:00
Melanie
4cdc8806fb
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:40:38 +01:00
Melanie
96174595da
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:39:32 +01:00
Justin Clark-Casey (justincc)
59aedbc94b
Rename SceneSetupHelpers.AddRootAgent to AddClient() to better represent its effects and return object
2011-07-09 02:25:40 +01:00
root
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
Justin Clark-Casey (justincc)
46f5893d55
Add basic flotsam asset cache test for retrieved cached asset.
...
Disabled temporarily since file system caching disrupts subsequent test runs
2011-07-04 21:35:15 +01:00
Melanie
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
Makopoppo
c7bdb66a1f
Added missing "Old Guids=true" to ConnectionString
2011-06-10 21:10:37 +01:00
Melanie
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
Justin Clark-Casey (justincc)
fe471b6424
Extend TestGiveInventoryFolder() to test giving back the freshly received folder
2011-06-04 02:44:53 +01:00
Justin Clark-Casey (justincc)
12b1cbf8bf
Fix give inventory tests to use different users rather than (accidentally) the same user. Extend TestGiveInventoryItem() to test giving back the same item.
2011-06-04 02:39:26 +01:00
Justin Clark-Casey (justincc)
896f039513
create TestGetInventoryItem()
2011-06-04 00:51:49 +01:00
Justin Clark-Casey (justincc)
1543fd7fff
extend TestGiveInventoryFolder() to check for the receipt by user 2
2011-06-04 00:20:54 +01:00
Justin Clark-Casey (justincc)
527e10a04e
add stub UserInventoryTests.GiveInventoryFolder(). Not yet complete
2011-06-03 23:13:05 +01:00
Diva Canto
6312eea459
HG IM bug fix: grid_instant_message was being placed in the default port instead of the specified one.
2011-06-02 10:14:26 -07:00
Diva Canto
3c15c0b264
Added test IM client.
2011-06-02 09:39:09 -07:00
Justin Clark-Casey (justincc)
8129e64e2a
Fill in the new OwnerData field in the LLUDP ScriptDialog message.
...
If we don't do this then viewer 2.8 crashes.
Resolves http://opensimulator.org/mantis/view.php?id=5510
2011-05-31 19:25:01 +01:00
Melanie
be1996f121
Merge branch 'master' into careminster-presence-refactor
2011-05-22 20:23:25 +01:00
Justin Clark-Casey (justincc)
bb9b317f15
Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead
2011-05-21 01:05:20 +01:00
Justin Clark-Casey (justincc)
4073f10133
rename test helpers enclosing package from Setup to Helpers
2011-05-21 00:51:34 +01:00
Justin Clark-Casey (justincc)
94553d4753
rename UserInventoryTestsUtils -> UserInventoryHelpers for consistency
2011-05-21 00:48:01 +01:00
Justin Clark-Casey (justincc)
156cc1418b
test helper rename for consistency
2011-05-21 00:44:58 +01:00
Justin Clark-Casey (justincc)
d7e5b76d73
refactor: rename AddSceneObjectItem to AddSceneObject
2011-05-21 00:39:42 +01:00
Justin Clark-Casey (justincc)
084059319c
refactor: move scene object item creation code into TaskInventoryHelpers
2011-05-21 00:37:20 +01:00
Justin Clark-Casey (justincc)
9103fe84d5
move test task inventory notecard item creation into a new TastInventoryHelpers class
2011-05-21 00:25:58 +01:00
Justin Clark-Casey (justincc)
534ee52a12
rename UserProfileTestUtils to UserAccountHelpers to be consistent with other test helper names
2011-05-21 00:11:52 +01:00
Justin Clark-Casey (justincc)
7ed419217f
add test for rezzing an object from a prim item
2011-05-20 23:22:27 +01:00
Melanie
37a7b87862
Merge branch 'master' into careminster-presence-refactor
2011-05-14 21:09:52 +01:00
Oren Hurvitz
64d868fb64
When loading an OAR that doesn't have parcels, create a default parcel
2011-05-14 00:41:32 +01:00
Melanie
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
Diva Canto
c062138dad
Moved several cap-based-service-providing modules from where they were into a newly created CoreModules/Caps. Not all.
2011-04-30 12:23:40 -07:00
Melanie
d1913f2429
Merge branch 'master' into careminster-presence-refactor
2011-04-18 20:17:29 +01:00
Mic Bowman
452ae375f0
Merge branch 'master' into test-merge0418
2011-04-18 11:29:43 -07:00
Melanie
ec0aa7a90b
Fix up client implementations
2011-04-17 23:17:05 +02:00
Melanie
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
Justin Clark-Casey (justincc)
66a62678e5
get rid of all traces of the now used mock service infrastructure
2011-04-15 01:37:27 +01:00
Justin Clark-Casey (justincc)
631654a38d
remove old code for a mock grid service, which got removed some time back
2011-04-15 01:30:49 +01:00
Justin Clark-Casey (justincc)
ba73df39a3
remove any reference to a mock authentication service since it doesn't exist and we don't use it
2011-04-15 01:26:07 +01:00
Justin Clark-Casey (justincc)
54e8855819
remove mock asset service for tests in favour of always using the real one
2011-04-15 01:23:26 +01:00
Justin Clark-Casey (justincc)
79bd430e08
Remove the mock inventory service for tests and just use the real one all the time with an in-memory data plugin
2011-04-15 01:10:26 +01:00
Justin Clark-Casey (justincc)
a0d80140f2
Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
...
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
Justin Clark-Casey (justincc)
821e67fb95
implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.
2011-04-14 20:59:52 +01:00
Justin Clark-Casey (justincc)
c644ab6a2c
Make scene object parts created by the test utils unit sized.
2011-04-14 20:21:44 +01:00
Mic Bowman
3fe22126ca
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-13 15:37:25 -07:00
Justin Clark-Casey (justincc)
58efd761d1
Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.
...
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
2011-04-13 21:17:43 +01:00
Melanie
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
Justin Clark-Casey (justincc)
63533412f8
Improve previous ILandObject method doc.
...
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
2011-04-06 18:57:50 +01:00
Melanie
329fa73695
Merge branch 'master' into careminster-presence-refactor
2011-04-01 07:44:43 +01:00
Melanie
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
Justin Clark-Casey (justincc)
6ae04448f7
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
...
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
2011-03-25 23:05:51 +00:00
Justin Clark-Casey (justincc)
ebbe3afaf1
Add PrimCountModuleTests.TestRemoveOwnerObject().
...
Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs
2011-03-23 23:14:55 +00:00
Justin Clark-Casey (justincc)
d5c7ae5c6b
refactor common sop setup parts into a single method
2011-03-23 22:40:23 +00:00
Justin Clark-Casey (justincc)
de88227bc4
refactor: simplify part of AddSceneObject() test setup by moving sog construction into SceneSetupHelpers.CreateSceneObject()
2011-03-23 22:29:27 +00:00
Melanie
3dc877c59f
Merge branch 'master' into careminster-presence-refactor
2011-03-14 14:48:00 +00:00
Justin Clark-Casey (justincc)
db2ad62c9b
in AssetHelpers.CreateAsset(), create objects using the 'original' xml format rather than 'xml2'
2011-03-10 19:52:19 +00:00
Melanie
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc)
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Justin Clark-Casey (justincc)
2fa8fc5052
remove inventory service preserving code from SceneSetupHelpers too
2011-03-09 01:37:31 +00:00
Justin Clark-Casey (justincc)
f375a5e9cb
Simplify SceneSetupHelpers class by removing all code which was originally preserving service instances between tests. This wasn't being used anyway and just leads to hard to diagnose test failures.
2011-03-09 01:31:47 +00:00
Justin Clark-Casey (justincc)
8a2360bf81
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
2011-03-09 01:21:31 +00:00
Melanie
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00:00
Justin Clark-Casey (justincc)
b3a1d8c7f7
Remove unused SceneSetupHelpers.DeleteObjectAsync().
...
Calling async code in automated tests is never a good idea - things become very fragile very quickly
2011-02-19 00:11:08 +00:00
Justin Clark-Casey (justincc)
9d668b09ca
remove unused code to share services between scenes in SceneSetupHelpers - this is done differently elsewhere
2011-02-19 00:07:16 +00:00
Justin Clark-Casey (justincc)
60fe3d48ee
Put some CapabilitiesModule null checks in Scene
...
Stop tests setting up a capabilities module by default
2011-02-18 23:50:54 +00:00
Justin Clark-Casey (justincc)
eb699df5f6
On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
...
Going this extra step doesn't appear to cause any test failures.
This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
2011-02-18 22:49:19 +00:00
Melanie
3435816541
Merge branch 'master' into careminster-presence-refactor
2011-01-27 20:54:02 +00:00
Justin Clark-Casey (justincc)
be3685b1a2
When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
...
The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.
Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00
Justin Clark-Casey (justincc)
5a26dc2743
Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
...
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
Melanie
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
Melanie
2cb2bff9b2
Implement SendPlacesReply
2010-12-30 00:31:59 +01:00
Teravus Ovares (Dan Olivares)
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
2010-12-21 19:15:44 -05:00