Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-14 | 1 | -2/+11 |
|\ | |||||
| * | When loading an OAR that doesn't have parcels, create a default parcel | Oren Hurvitz | 2011-05-14 | 1 | -2/+11 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Moved several cap-based-service-providing modules from where they were into ↵ | Diva Canto | 2011-04-30 | 1 | -1/+0 |
| | | | | | | | | a newly created CoreModules/Caps. Not all. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 1 | -9/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'master' into test-merge0418 | Mic Bowman | 2011-04-18 | 4 | -369/+49 |
| |\ | |||||
| * | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-13 | 1 | -9/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | ||||
* | | | Fix up client implementations | Melanie | 2011-04-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 4 | -368/+63 |
|\ \ \ | | |/ | |/| | |||||
| * | | get rid of all traces of the now used mock service infrastructure | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -30/+2 |
| | | | |||||
| * | | remove old code for a mock grid service, which got removed some time back | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -8/+3 |
| | | | |||||
| * | | remove any reference to a mock authentication service since it doesn't exist ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -12/+7 |
| | | | | | | | | | | | | and we don't use it | ||||
| * | | remove mock asset service for tests in favour of always using the real one | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -132/+5 |
| | | | |||||
| * | | Remove the mock inventory service for tests and just use the real one all ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -199/+6 |
| | | | | | | | | | | | | the time with an in-memory data plugin | ||||
| * | | Make all the objects in a coalescence reappears after being loaded from an ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 3 | -6/+30 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet. | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -2/+16 |
| | | | |||||
| * | | Make scene object parts created by the test utils unit sized. | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -2/+2 |
| |/ | |||||
| * | Add coalesced scene objects class and serializer. This is currently only ↵ | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 1 | -5/+11 |
|\ \ | |/ | |||||
| * | Improve previous ILandObject method doc. | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -5/+11 |
| | | | | | | | | For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -4/+59 |
|\ \ | |/ | |||||
| * | Add PrimCountModuleTests.TestRemoveOwnerObject(). | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -5/+22 |
| | | | | | | | | Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs | ||||
| * | refactor common sop setup parts into a single method | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -17/+23 |
| | | |||||
| * | refactor: simplify part of AddSceneObject() test setup by moving sog ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -0/+32 |
| | | | | | | | | construction into SceneSetupHelpers.CreateSceneObject() | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | in AssetHelpers.CreateAsset(), create objects using the 'original' xml ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 1 | -1/+1 |
| | | | | | | | | format rather than 'xml2' | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 4 | -92/+53 |
|\ \ | |/ | |||||
| * | Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. | Justin Clark-Casey (justincc) | 2011-03-09 | 3 | -2/+3 |
| | | | | | | | | This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement. | ||||
| * | remove inventory service preserving code from SceneSetupHelpers too | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -37/+10 |
| | | |||||
| * | Simplify SceneSetupHelpers class by removing all code which was originally ↵ | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -53/+40 |
| | | | | | | | | preserving service instances between tests. This wasn't being used anyway and just leads to hard to diagnose test failures. | ||||
| * | Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make ↵ | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -3/+3 |
| | | | | | | | | static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-19 | 2 | -78/+24 |
|\ \ | |/ | |||||
| * | Remove unused SceneSetupHelpers.DeleteObjectAsync(). | Justin Clark-Casey (justincc) | 2011-02-19 | 1 | -19/+0 |
| | | | | | | | | Calling async code in automated tests is never a good idea - things become very fragile very quickly | ||||
| * | remove unused code to share services between scenes in SceneSetupHelpers - ↵ | Justin Clark-Casey (justincc) | 2011-02-19 | 1 | -52/+16 |
| | | | | | | | | this is done differently elsewhere | ||||
| * | Put some CapabilitiesModule null checks in Scene | Justin Clark-Casey (justincc) | 2011-02-18 | 2 | -6/+9 |
| | | | | | | | | Stop tests setting up a capabilities module by default | ||||
| * | On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() ↵ | Justin Clark-Casey (justincc) | 2011-02-18 | 1 | -5/+3 |
| | | | | | | | | | | | | | | 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(). | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | When an oar is loaded, do not create a default parcel before loading the ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | 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). | ||||
| * | Fix OAR parcel loading so that old parcels are replaced by the new instead ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -0/+5 |
| | | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling. | ||||
| * | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+4 |
| | | |||||
* | | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 1 | -0/+5 |
| | | | | | | | | | | | | * 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 2 | -1/+241 |
|\ \ | |/ | |||||
| * | Start implementing a test for 'share with group' object functionality. Not ↵ | Justin Clark-Casey (justincc) | 2010-12-14 | 2 | -3/+7 |
| | | | | | | | | | | | | | | yet complete. While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete. Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation) | ||||
| * | Add mock group services connector and use this in tests | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+236 |
| | | |||||
* | | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵ | Melanie | 2010-11-05 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -1/+9 |
|\ \ | |/ |