aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Serialization (follow)
Commit message (Collapse)AuthorAgeFilesLines
* On to 0.8.3!Diva Canto2015-10-181-1/+1
|
* Better handling of invalid XML: a) prevent infinite loop on EOF; b) better ↵Oren Hurvitz2015-08-111-8/+32
| | | | | | | | logging If the XML was truncated for some reason then ExecuteReadProcessors() would get into an infinite loop, using high CPU. Now it detects EOF (and several other error cases) and aborts. The rest of the changes just improve logging of XML in case of errors, so that we can see what the bad XML is.
* WARNING: massive refactor to follow libomv's latest changes regarding ↵Diva Canto2015-08-081-9/+1
| | | | | | | inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter. All tests pass, but fingers crossed!
* Mantis #7657 and #7514. This should alleviate the problem of bad object ↵Diva Canto2015-08-011-0/+19
| | | | | | | | | | | assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon: (1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!) (2) importing assets via OAR and IAR Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657. Virus!
* Refactored some code that is used in two different dlls related to SOP ↵Diva Canto2015-05-051-1/+183
| | | | rewriting. Also added some unit tests that relate to mantis #7514
* It wasn't that. Revert "Mantis #7514"Diva Canto2015-05-021-3/+0
| | | | This reverts commit 365f46bfa91245e6e277a180dc6bbf757ea2540f.
* Mantis #7514Diva Canto2015-05-021-0/+3
| | | | | Mono bug introduces double xmlns attribute names when rewriting the asset in HGAssetService, e.g. <SceneObjectPart xmlns:xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xmlns:xsd="http://www.w3.org/2001/XMLSchema">. Solution: remove all attributes before saving.
* Updated all occurrences of AssemblyVersion("0.8.1.*") to ↵Diva Canto2015-04-291-1/+1
| | | | AssemblyVersion("0.8.2.*")
* Ignore whitespace when reading serialized XML objects.Justin Clark-Casey (justincc)2014-08-293-31/+31
| | | | | | This was previously effectively being done by XmlDocument in the multiple passes through the XML. This change tells XmlReader to ignore whitespace. This also means changing arguments to use XmlReader instead of XmlTextReader (a descendent of XmlReader) directly. XmlReader.Create() has been the recommend way to create XML readers since .NET 2.0 as per MS SDK and is the only way to specific ignore whitespace settings.
* Change assembly versions to 0.8.1Justin Clark-Casey (justincc)2014-06-171-1/+1
|
* When saving an OAR in "Publish" mode, also discard Group informationOren Hurvitz2014-05-262-10/+11
|
* Refactored: ExternalRepresentationUtils should be the only place where the ↵Oren Hurvitz2014-03-242-4/+15
| | | | | | "CreatorData" field is calculated, to ensure uniformity Resolves http://opensimulator.org/mantis/view.php?id=6933
* Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-0/+3
| | | | | | "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-1/+1
| | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
|
* Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
|
* Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-242-2/+2
| | | | automatically turns off any logging enabled between tests
* Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-241-0/+5
| | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
* A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-141-0/+33
|
* Support multi-region OAR filesOren Hurvitz2012-09-141-0/+5
| | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
* Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-291-3/+11
| | | | | | | | | | | 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 old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-032-35/+72
| | | | | | This was working in 0.7.2 but was accidentally removed from 0.7.3. The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info. Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved.
* Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-131-3/+1
| | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
* Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-114-23/+16
| | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-302-2/+2
|
* Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-142-2/+43
|
* Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-122-43/+2
| | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
* Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-102-2/+43
| | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* On object deserialization, go back to logging errors at DEBUG level rather ↵Justin Clark-Casey (justincc)2012-02-131-6/+13
| | | | | | | | than ERROR. Restore extra log message if shape processing fails. Logging level was DEBUG before 312e145 (Fri Feb 3 2012). 312e145 also accidentally removed the 'general error' log message if any shape deserialization failed. This commit restores it, though this has no functional impact.
* Add TestRegionSettingsDeserializeJustin Clark-Casey (justincc)2012-02-042-1/+135
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-031-2/+2
|\
| * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-045-106/+204
| |\
| * | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵Snoopy Pfeffer2012-02-031-2/+2
| | | | | | | | | | | | corresponding RemoteAdmin parameter
* | | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-9/+28
| |/ |/| | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
* | Refactor common deserialization processor code to generic method ↵Justin Clark-Casey (justincc)2012-02-033-98/+62
| | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors()
* | Change LandDataSerializer deserialization so that in the future it won't ↵Justin Clark-Casey (justincc)2012-02-034-74/+208
|/ | | | | | care about extra elements or element order. This brings it into line with other deserializations such as object and will improve future backward compatibility.
* Fix test failureMelanie2012-02-031-0/+1
|
* Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-022-11/+13
| | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-121-4/+4
| | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
* Save the sun's position in OARsOren Hurvitz2011-06-101-2/+6
|
* remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-051-6/+2
| | | | | However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc. This is probably why prim counts were being done there in the first place.
* Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make ↵Justin Clark-Casey (justincc)2011-03-091-1/+18
| | | | static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
* Addresses mantis #5360: CreatorData was being written as long as it wasn't ↵Diva Canto2011-02-031-1/+1
| | | | null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
* Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-011-0/+12
|
* Fix unit test.Diva Canto2010-11-291-0/+6
|
* Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-293-8/+295
| | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
* Changed the parser for InventoryItem deserialization. Moved some utility ↵Diva Canto2010-11-271-30/+168
| | | | functions around.
* Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| | | | | | Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/ However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer). Not sure if this is really and OAR load problem. Needs more investigation.
* Formatting cleanup.Jeff Ames2010-09-121-10/+10
|