| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
|
|
|
|
| |
Unlike "save oar", this was happening on the same thread as the original request.
The timeout happens on another so the original thread is never aborted.
On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging.
Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar".
Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
|
| |
|
|
|
|
|
|
|
|
|
| |
folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders.
This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder.
Added regression test for this case.
Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService
Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used
since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs.
However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
|
| |
|
|
|
|
|
|
| |
the same simulator.
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
Like "save oar", this saves an iar without assets
This can be useful for backup when you know the required assets will still be present (e.g. you're backing up the assets db separately).
This also bumps the iar format version to 0.3 and 1.2 respectively.
0.3 is backward compatible with previous opensim versions
1.2 is used if the --profile switch is specified. It is only compatible with 0.7.1 presently.
|
| |
|
|
| |
OpenSim.Tests.Common instead
|
| |
|
|
| |
other test helper names
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
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.
|
| | |
|
| | |
|
| |
|
|
| |
on the target system for an iar load
|
| | |
|
| | |
|
| |
|
|
| |
as well
|
| | |
|
| |
|
|
|
|
|
|
|
| |
OSP resolved ID if newer CreationData is not present.
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only. Tests updated to check this behaviour.
|
| |
|
|
| |
constructing the tar manually
|
| |
|
|
|
|
| |
intention (i.e. OSPA resolution, which is still active).
Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load.
|
| |
|
|
| |
into a new test TestLoadIarToInventoryPaths()
|
| |
|
|
| |
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
|
| |
|
|
| |
test case parent
|
| |
|
|
| |
static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
|
| |
|
|
| |
recreating it every time
|
| |
|
|
| |
This is pointless as we're supplying the password on the command line
|
| | |
|
| |
|
|
| |
usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
|
| | |
|
| |
|
|
| |
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
|
| | |
|
| | |
|
| |
|
|
| |
/Objects is now valid where it wasn't before)
|
| | |
|
| |
|
|
| |
Also comment out log4net line in InventoryArchiverTests
|
| |\
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
|
| | |
| |
| |
| |
| |
| | |
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
|
| |/
|
|
| |
the iar module from being able to save single item iars
|
| |
|
|
|
| |
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
|
| |
|
|
| |
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
|
| |
|
|
| |
just the first one
|
| |
|
|
|
|
| |
GetFolder(InventoryFolderBase folder)"
This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd.
|
| |
|
|
|
|
|
| |
GetFolder(InventoryFolderBase folder)
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
|
| |
|
|
| |
add various helper functions for simplifying test readability
|
| |
|
|
| |
order to improve readability
|
| | |
|
| | |
|
