aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-031-7/+0
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs.
* | Resolve merge commits, stage 1Tom2011-09-041-26/+27
|\ \ | |/
| * stop passing FromUserInventoryItemID right down into the deserializer.Justin Clark-Casey (justincc)2011-09-021-13/+3
| | | | | | | | the code becomes simpler if this is set from the outside - only one place needs to do this.
| * Fix llAttachToAvatar()Justin Clark-Casey (justincc)2011-08-241-9/+22
| | | | | | | | | | | | Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay. So we now don't do this. The state will be serialized anyway when the avatar normally logs out. The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state.
| * remove undo state storage in a few places where it's pointlessJustin Clark-Casey (justincc)2011-07-191-3/+1
| | | | | | | | no functional effect - existing bugs still remain
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-0/+2
|\ \ | |/
| * minor: code tidy and inserted log lines for future use.Justin Clark-Casey (justincc)2011-07-091-0/+2
| | | | | | | | | | | | | | | | Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory When phantom is toggled, the sculptdata is regenerated before remeshing. But on resize, the sculptdata is not regenerated. So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-1/+1
|\ \ | |/
| * When serializing objects, stop accidentally using the green text colour ↵Justin Clark-Casey (justincc)2011-06-101-1/+1
| | | | | | | | | | | | value for alpha This addresses http://opensimulator.org/mantis/view.php?id=5111
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-5/+25
|\ \ | |/
| * Make sure culture is en-US when saving archive related xml.Justin Clark-Casey (justincc)2011-05-271-1/+0
| | | | | | | | This might resolve http://opensimulator.org/mantis/view.php?id=5475
| * If parsing fails in the primitive base shape (which prints out a debug log ↵Justin Clark-Casey (justincc)2011-05-271-4/+25
| | | | | | | | | | | | message), also print out the name and uuid of the part containing this shape. This is to help in diagnosing parsing failures.
| * Add PayPrice to serialization format Xml2Melanie2011-05-251-1/+36
| |
* | Persist Buoyancy in inventoryMelanie2011-06-021-0/+9
| |
* | Add PayPrice to serialization format Xml2Melanie2011-05-251-1/+36
| |
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-11-19 23:24:40 +0000