Tom
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
Oren Hurvitz
7f318277f1
When creating an OAR, optionally exclude objects according to their permissions
2011-09-12 20:09:24 +01:00
Justin Clark-Casey (justincc)
bea2e0f32b
Comment out the part of the load oar code that zeroes out prim sit target orientations and positions.
...
The warning about these causing problems is very old and may no longer apply.
Hopes to fix http://opensimulator.org/mantis/view.php?id=5680
2011-09-09 22:50:54 +01:00
Tom
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07: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
Melanie
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
Justin Clark-Casey (justincc)
603dbea190
tweak messages. Make verbose inventory item save message give the item name as well as item id and asset id
2011-06-14 00:51:18 +01:00
Melanie
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
Oren Hurvitz
804fe2d9b0
Save the sun's position in OARs
2011-06-10 20:55:58 +01:00
Melanie
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
Justin Clark-Casey (justincc)
e9988a3728
Make sure culture is en-US when saving archive related xml.
...
This might resolve http://opensimulator.org/mantis/view.php?id=5475
2011-05-27 21:19:20 +01:00
Melanie
f02fbdbc68
Merge branch 'master' into careminster-presence-refactor
2011-05-27 01:10:02 +01:00
Justin Clark-Casey (justincc)
3270f4353e
Add --noassets option for "save iar"
...
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.
2011-05-26 02:22:52 +01:00
Justin Clark-Casey (justincc)
c7e46e8a51
Bump OAR file format version up to 0.7 for this development cycle.
...
This adds a <assets_included>true|false</assets_included> element to the oar control file, though this is not used on reloading at this time.
This addition is backward compatible with previous opensim releases
2011-05-26 01:37:15 +01:00
Justin Clark-Casey (justincc)
6f4d079fc5
Add a --noassets option to "save oar".
...
This switch stops any assets being saved in the oar.
This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available.
2011-05-26 01:27: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
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
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
Justin Clark-Casey (justincc)
6109605038
bump oar version number to 0.6.
...
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
2011-04-18 22:42:36 +01:00
Justin Clark-Casey (justincc)
6600aa2baf
Add regression test to check that OARs start with the control file.
2011-04-18 22:35:33 +01: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
Melanie
3f200da878
Merge branch 'master' into careminster-presence-refactor
2011-01-28 02:36:20 +00:00
Justin Clark-Casey (justincc)
f9ea5e69c5
Refactor: Break out LoadObjects() and LoadParcels() from a longer method
2011-01-27 21:07:21 +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)
42c0dbf49a
Show local IDs in "land show" output.
...
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +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
Diva Canto
0fabe0e5a5
Added more debug messages under the -verbose option.
2011-01-08 16:33:33 -08:00
Melanie
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
Justin Clark-Casey (justincc)
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
Melanie
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
Diva Canto
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
Melanie
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
Marck
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
Melanie
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
Diva Canto
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
Melanie
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
Diva Canto
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
Justin Clark-Casey (justincc)
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
Justin Clark-Casey (justincc)
d7bca3d8e8
Fix unit tests and save problems
...
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
Justin Clark-Casey (justincc)
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00:00
Justin Clark-Casey (justincc)
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
Melanie
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
Diva Canto
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
Melanie
05dbe4f2c4
Merge branch 'master' into careminster-presence-refactor
2010-10-27 20:49:27 +01:00
Jeff Ames
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
