Melanie
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
Justin Clark-Casey (justincc)
1e8e98a07f
Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
...
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
Justin Clark-Casey (justincc)
107052b23d
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
...
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.
2010-09-04 00:09:53 +01:00
Justin Clark-Casey (justincc)
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
Melanie
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
Justin Clark-Casey (justincc)
def6b1544f
very minor log message and var name tweaking for iar saving
2010-08-28 02:40:21 +01:00
Justin Clark-Casey (justincc)
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
Justin Clark-Casey (justincc)
4f9931ec10
minor: reduce log chattiness of "load iar" for IARs with lots of folders
2010-08-27 23:23:55 +01:00
Justin Clark-Casey (justincc)
86937d0a0f
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
2010-08-27 23:22:49 +01:00
Justin Clark-Casey (justincc)
8f875700ef
refactor: Make IAR tests set up standard iar for loading
2010-08-27 22:52:26 +01:00
Justin Clark-Casey (justincc)
8571a55d29
minor: change log message from info to debug
2010-08-26 20:42:56 +01:00
Melanie
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
Justin Clark-Casey (justincc)
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
Melanie
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
Justin Clark-Casey (justincc)
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
Melanie
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
Justin Clark-Casey (justincc)
8d520f4525
Remove old test classes that don't actually test anything not done elsewhere
...
Also comment out log4net line in InventoryArchiverTests
2010-08-07 00:50:01 +01:00
Melanie
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
Justin Clark-Casey (justincc)
a133acbd5f
Merge branch 'iar-merge'
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
2010-08-04 20:56:52 +01:00
sacha
a48c493210
Cost Reduction : Removing verbose message....
2010-08-04 08:16:55 +00:00
Melanie
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
Justin Clark-Casey (justincc)
8c10cb5ffe
improve closing of load/save iar streams in the event of a problem
2010-07-14 20:43:35 +01:00
Melanie
0b74662ce2
Merge branch 'master' into careminster-presence-refactor
2010-07-14 19:53:15 +01:00
Justin Clark-Casey (justincc)
71433075a9
Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars
2010-07-14 17:12:12 +01:00
Melanie
eacf3d9221
Merge branch 'master' into careminster-presence-refactor
2010-07-13 20:46:21 +01:00
Justin Clark-Casey (justincc)
86f3f83250
uncomment a load iar code line I accidentally commented in the last commit
...
hooray for automated tests
2010-07-12 23:37:08 +01:00
Justin Clark-Casey (justincc)
3156f4bbeb
comment out a lot of the debug log messages when loading an iar
...
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
2010-07-12 23:00:01 +01:00
Justin Clark-Casey (justincc)
5925aac859
Add --merge switch to load iar.
...
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
2010-06-30 00:10:44 +01:00
Melanie Thielker
95c763201f
Set the offline flag in inventory offers
2010-06-20 06:36:46 +02:00
Justin Clark-Casey (justincc)
71c8bbaf2c
Fix problem where iar load would duplicate huge number of folders
...
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
2010-06-18 17:37:28 +01:00
Justin Clark-Casey (justincc)
11a35d8cda
change TestPartExistingIarPath() to check appropriate folder creation
...
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 17:10:16 +01:00
Justin Clark-Casey (justincc)
cf4721a92d
in IAR utils, return all folders that match a particular path rather than just the first one
2010-06-18 16:33:34 +01:00
Justin Clark-Casey (justincc)
0dce4f1997
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
...
This reverts commit 3525195bc9
2010-06-11 22:13:36 +01:00
Justin Clark-Casey (justincc)
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as 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
2010-06-11 21:55:18 +01:00
Justin Clark-Casey (justincc)
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
Justin Clark-Casey (justincc)
1a16a92a62
create inactive test for iar folders/items merged with existing paths
...
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
Diva Canto
5d099182c3
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
2010-06-11 13:14:07 -07:00
Diva Canto
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
Justin Clark-Casey (justincc)
63797445be
various refactorings on methods to replicate IAR paths to user inventory in order to improve readability
2010-06-05 00:48:33 +01:00
Justin Clark-Casey (justincc)
3c3df9f3e9
refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()
2010-06-04 23:34:42 +01:00
Justin Clark-Casey (justincc)
72bd68a21f
add ability for load iar/save iar to take in arbitrary options
...
not used for anything yet
2010-06-04 22:17:23 +01:00
Justin Clark-Casey (justincc)
0526d3a535
bring TestLoadIarV0_1AbsentUsers() back online
2010-06-04 21:19:37 +01:00
Justin Clark-Casey (justincc)
a08ace300b
bring TestIarV0_1WithEscapedChars() back online
2010-06-04 21:15:25 +01:00
Justin Clark-Casey (justincc)
f523c2033d
bring test TestLoadIarV0_1ExistingUsers() back online
2010-06-04 21:11:13 +01:00
Justin Clark-Casey (justincc)
df2bcf7b6b
remove pointless mock user account service since the real one can now be easily configured for test purposes
2010-06-04 20:56:24 +01:00
Justin Clark-Casey (justincc)
75878c8f43
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
...
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
Justin Clark-Casey (justincc)
191db0e6a4
get TestSaveIarV0_1() uncommented but not running as a test yet since I didn't get the authentication server to work and my brain is about to fizzle out my ears
2010-05-28 23:14:24 +01:00
Justin Clark-Casey (justincc)
a60ca5236c
restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService
2010-05-28 21:37:48 +01:00
Justin Clark-Casey (justincc)
505cb82dee
fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work
2010-05-28 21:14:15 +01:00
Justin Clark-Casey (justincc)
fff5459f4d
Add ability to load IARs directly from URIs
...
So, something like
load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar
Will load my IAR directly from the web.
2010-05-28 20:07:15 +01:00
