aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-211-18/+29
|\
| * Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-211-18/+29
| | | | | | | | This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-172-4/+170
|\ \ | |/
| * Make all the objects in a coalescence reappears after being loaded from an ↵Justin Clark-Casey (justincc)2011-04-151-6/+41
| | | | | | | | | | | | | | 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.
| * refactor: move code to obtain the coalescence size and object offsets into ↵Justin Clark-Casey (justincc)2011-04-131-15/+12
| | | | | | | | CoalescedSceneObjects from the serializer.
| * Add coalesced scene objects class and serializer. This is currently only ↵Justin Clark-Casey (justincc)2011-04-132-3/+137
| | | | | | | | | | | | | | | | | | used by the TestRezCoalescedObject() regression test. This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc. Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item. Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place. This bug will be addressed shortly.
| * Bug fix in object serialization -- sculpt data was wrong.Diva Canto2011-04-121-1/+1
| |
| * Fixes the issue of hung archives. Problem was with SceneObjectSerializer.Diva Canto2011-01-081-0/+12
| | | | | | | | Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-171-9/+7
|\ \ | |/
| * remove mono compiler warning: if (sop.Color != null) always returns true as ↵Justin Clark-Casey (justincc)2010-12-171-9/+7
| | | | | | | | sop.Color is a value type.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-122/+42
|\ \ | |/ | | | | Also prevent god takes from ending up in Lost and Found
| * Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-291-31/+11
| | | | | | | | 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-91/+31
| | | | | | | | functions around.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-2/+42
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-211-2/+21
| | | | | | | | | | | | 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).
| * Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2010-11-211-0/+21
| | | | | | | | | | | | | | 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.
| * Diva needs a spanking! Serializing OldItemID breaks script state persistence ↵Melanie2010-11-161-1/+4
| | | | | | | | in agent inventory.
* | Diva needs a spanking! Serializing OldItemID breaks script stateMelanie2010-11-161-1/+4
| | | | | | | | persistence in agent inventory.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-3/+17
|\ \ | |/
| * Old deserialization can't deal with commas in flag fields. Making use of ↵Diva Canto2010-11-021-3/+17
| | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-271-1/+1
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-271-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-251-3/+16
|\ \ | |/
| * Added inner exception handling in Shape deserialization processing, so that ↵Diva Canto2010-10-231-3/+16
| | | | | | | | the whole Shape processing returns a valid Shape object.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-8/+50
|\ \ | |/
| * It looks like Vector3s also got written down in lower case at some point in ↵Diva Canto2010-10-191-3/+3
| | | | | | | | | | | | time. Added code to account for that. 17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838.
| * Another take related to the previous commit.Diva Canto2010-10-191-13/+17
| |
| * Added code to quaternion deserialization to try to cope with an exception ↵Diva Canto2010-10-191-4/+15
| | | | | | | | | | | | seen in Wright Plaza related to SitTargetOrientation. 17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064.
| * Added TextureAnimation and ParticleSystem to serialization.Diva Canto2010-10-191-0/+27
| |
| * COmmented the wrong line instead, now I commented them all to be on the safe ↵Melanie2010-10-191-2/+2
| | | | | | | | side
* | COmmented the wrong line instead, now I commented them all to be on the safe ↵Melanie2010-10-191-2/+2
| | | | | | | | side
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-191-1/+1
|\ \ | |/
| * Comment a spammy debug message in the serializerMelanie2010-10-191-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-181-53/+18
|\ \ | |/
| * Deleted all [XmlIgnore] from SOP, since those are meaningless now.Diva Canto2010-10-171-3/+3
| |
| * .NET automagical serialization of SOPs replaced by manual serialization ↵Diva Canto2010-10-171-50/+15
| | | | | | | | across the board.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-162-120/+153
|\ \ | |/
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ↵Diva Canto2010-10-152-120/+153
| | | | | | | | old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-162-309/+178
|\ \ | |/
| * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵Diva Canto2010-10-142-105/+164
| | | | | | | | to be generating xml's that are successfully parsed. Needs more testing.
| * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-132-7/+1381
|\ \ | |/
| * Comment a debug message so that it doesn't spew the console upon ↵Diva Canto2010-10-131-1/+1
| | | | | | | | encountering unknown xml elements.
| * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵Diva Canto2010-10-132-7/+1381
| | | | | | | | load oar and load xml2, but not for packing objects on crossings/TPs yet.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-16/+12
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-16/+12
| | | | | | | | MapAndArray collection
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-13/+10
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-13/+10
| |
| * Preserving the link numbers is a serializer's highest duty.Melanie Thielker2010-06-121-0/+9
| | | | | | | | | | Prevent region crossings from screwing up complex attachments by preserving link numbers.
* | The majority of the Undo fix. There is still an issue with Rotation which ↵Tom Grimshaw2010-07-041-2/+2
| | | | | | | | i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging.