aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Make the IteratingUuidGatherer the only UuidGatherer.Justin Clark-Casey (justincc)2015-01-081-8/+6
| | | | | This UUID gatherer provides a superset of the previous gatherer's functionality as it also allows the caller to control gathering iterations for load purposes.
* refactor: Move methods to start a monitored thread, start work in its own ↵Justin Clark-Casey (justincc)2014-11-251-1/+1
| | | | | | | | thread and run work in the jobengine from Watchdog to a WorkManager class. This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management. Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget. Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
* refactor: consistently put all test classes in the OpenSim.Tests.Common ↵Justin Clark-Casey (justincc)2014-11-255-5/+0
| | | | | | package rather than some in OpenSim.Tests.Common.Mock the separate mock package was not useful and was just another using line to always add
* Improve on the last commit to InventoryArchiver: put back the original ↵Diva Canto2014-09-283-10/+23
| | | | constructor (3rd party modules use it), change order of new parameters to make it more consistent.
* Modifications to previous IAR commits to bring them more inline with ↵AliciaRaven2014-09-232-7/+10
| | | | existing OpenSim code conventions. Also include new IAR save switch in console help print out.
* Add an event callback for loading IAR files. The callback for creating them ↵AliciaRaven2014-09-237-45/+133
| | | | already existed but not for loading. This is of interest for use by region modules. Also includes reporting numbers of items saved and items filtered to the completed log printout.
* Change existing IAR save to use UUID for its callback reference instead of ↵AliciaRaven2014-09-235-17/+17
| | | | Guid. This is for uniformity as discussed on IRC.
* Include same content filters for IAR file exports that already exist for OAR ↵AliciaRaven2014-09-232-0/+54
| | | | files. Adds new console switch --perm=CTM to save iar command.
* For monitoring purposes, start non-timeout tasks (which do not currently use ↵Justin Clark-Casey (justincc)2014-09-051-1/+2
| | | | | | | a threadpool) via Watchdog.RunInThread() rather than Util.RunThreadNoTimeout() The functionality is the same but this allow us to monitor such tasks via "show threads" and abort them for test purposes, etc. Also extends thread names to provide more info (e.g. SendInitialDataToClient says what client the task is for).
* Show more meaningful error messages when failed to give an item to another userOren Hurvitz2014-05-061-6/+5
|
* Run slow operations in a separate thread, instead of using FireAndForget ↵Oren Hurvitz2014-03-251-1/+1
| | | | | | (which has a 1-minute timeout) Resolves http://opensimulator.org/mantis/view.php?id=6945
* Refactored Load IAR: created a generic mechanism to modify the SOG's as they ↵Oren Hurvitz2014-03-241-47/+19
| | | | | | are being loaded Resolves http://opensimulator.org/mantis/view.php?id=6942
* Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-2/+2
| | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
* refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-2/+2
| | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* minor: Recomment out log message uncommented in previous cbdfe969Justin Clark-Casey (justincc)2013-09-211-4/+4
|
* When giving items between avatars in different simulators, only add the item ↵Oren Hurvitz2013-09-211-9/+44
| | | | | | to the receiving avatar's inventory once. When a user gives an item, the user's client sends an InventoryOffered IM message to its simulator. This adds the item to the receiver's inventory. If the receiver isn't in the same simulator then XMLRPC is used to forward the IM to the correct simulator. The bug was that the receiving simulator handled the message by calling OnInstantMessage() again, which added a second copy of the item to the inventory. Instead, the receiving simulator should only notify the avatar that the item was offered.
* Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1
| | | | printed the error message and not the call stack.
* Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to ↵Diva Canto2013-07-054-23/+27
| | | | be less dependent on a Scene.
* Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-292-5/+198
|
* Add regression test for inventory item give, reject and subsequent trash ↵Justin Clark-Casey (justincc)2013-04-291-0/+256
| | | | | | folder purge by receiver. This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
* Add regression test for offer, accept and subsequent receiver delete of an ↵Justin Clark-Casey (justincc)2013-04-291-80/+3
| | | | item offered via instant message.
* Fix bug where an agent that declined an inventory offer and subsequently ↵Justin Clark-Casey (justincc)2013-04-291-2/+8
| | | | | | emptied their trash would make the item invalid in the giver's inventory This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
* Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
|
* Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
* Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-165-27/+179
|
* On IAR loading, if loading of a coaleseced item entirely fails, then ↵Justin Clark-Casey (justincc)2013-02-081-0/+18
| | | | continue with the IAR load rather than failing completely.
* If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-021-2/+8
| | | | that the operation failed
* Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-70/+68
| | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
* Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-172-5/+4
| | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
* Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-131-0/+2
|
* Disable code to get server-side to move given items to a destination folder ↵Justin Clark-Casey (justincc)2012-11-131-67/+70
| | | | | | | | | on TaskInventoryAccepted. This is because the fixes to inventory versioning (so that they better match viewer expections) now appear to allow the viewer to execute #RLV moves, as happens on the LL grid. Doing it again server-side now wrongly creates another child #RLV folder underneath the root one. As per http://opensimulator.org/mantis/view.php?id=6311
* Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
|
* Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-1/+1
| | | | grepping for remaining uses
* One more module converted: InventoryArchiverModule.Diva Canto2012-11-111-8/+31
|
* Prevent IMs being sent to prims when avies decline inventory offers from them.Diva Canto2012-11-041-9/+12
|
* Comment out checks not to overwrite existing IAR/OAR files for now on "save ↵Justin Clark-Casey (justincc)2012-11-011-2/+2
| | | | | | | iar/oar" since this causes problems for some backup systems. Needs more thought, maybe an explicit --force/--overwrite switch Comments on http://opensimulator.org/mantis/view.php?id=6389
* minor: Fix verbose IAR save message to make it a bit clearer that item data ↵Justin Clark-Casey (justincc)2012-10-271-1/+1
| | | | is being saved at that point, not asset data.
* Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-263-14/+29
| | | | | | | | 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.
* Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations ↵Justin Clark-Casey (justincc)2012-10-261-77/+77
| | | | | | since the call itself does nothing and the return value is ignored by all callers. This is a very old method (+4 years) so is probably confusing code cruft.
* Get "save oar" and "save iar" to tell you in a more friendly manner if the ↵Justin Clark-Casey (justincc)2012-10-241-0/+4
| | | | | | filename to save already exists, rather than exception throwing. Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
* On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-0/+42
| | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
* Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
|
* Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-291-32/+32
| | | | | | | | | | | 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.
* Fix regression where llGiveInventory() had stopped asking non-owner ↵Justin Clark-Casey (justincc)2012-07-171-1/+3
| | | | | | | | | receivers to accept/decline. This appears to be a regression from back in commit db91044 (Mon Aug 22 2011) where we started to send TaskInventoryOffered msg dialog rather than InventoryOffered dialog. This is probably correct, but failed because the bucket was too large and because we wouldn't have handled the TaskInventoryDeclined option anyway. This patch handles both of these and make llGiveInventoryList() use TaskInventoryOffered as well Fixes http://opensimulator.org/mantis/view.php?id=6089
* Fix issue in InventoryArchiveTestCase where it didn't call down to ↵Justin Clark-Casey (justincc)2012-06-271-1/+2
| | | | OpenSimTestCase.SetUp()
* Automatically disable log4net before each regression test so that logging is ↵Justin Clark-Casey (justincc)2012-06-271-1/+1
| | | | | | | confined to a single test if it's turned on. This involves making test classes inherit from a common OpenSimTestCase. This will be applied to more classes as required.
* Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-1/+4
| | | | DotNetZip provides much better compression than standard .NET.
* Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-273-9/+9
| | | | | | | | 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.
* Added ability to exclude inventory items or folders when saving IAR files.Kevin Cozens2012-04-132-84/+128
|
* Clean up "save iar" helpJustin Clark-Casey (justincc)2012-03-171-8/+8
|