aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-271-2/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Fix bug where an avatar that had an object they owned attached through ↵Justin Clark-Casey (justincc)2012-05-231-2/+18
| | | | | | | | | | | | | | llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene. This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
* | Merge branch 'master' into careminsterMelanie2012-05-162-113/+4
|\ \ | |/
| * Route OAR SOG loading through the common ↵Justin Clark-Casey (justincc)2012-05-162-113/+4
| | | | | | | | | | | | SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). Remove buggy Xml2ToSOG().
| * Port Avination's collision fixes to core.Melanie2012-05-151-0/+7
| |
* | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-141-0/+7
| |
* | bug fixs, added a default physics shape estimator based on being a mesh or ↵UbitUmarov2012-03-141-5/+5
| | | | | | | | not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
* | missed commit of extraphysics parameters serialization..UbitUmarov2012-03-131-6/+46
| |
* | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-4/+4
| | | | | | | | other way because SOG doesn't technically exist in the DB
* | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-261-5/+0
| | | | | | | | code.
* | Serialize Keyframe motion for region crossingsMelanie2012-02-261-1/+21
| |
* | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵UbitUmarov2012-02-251-1/+16
| | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
* | Uncomment serializationMelanie2012-02-191-3/+3
| |
* | Merge branch 'ubitwork'Melanie2012-02-191-0/+28
|\ \
| * | Vehicle XML serialization more complete. Inactived by coments in ↵UbitUmarov2012-02-191-0/+28
| | | | | | | | | | | | SceneObjectSerializar.cs until proper testing
* | | Merge branch 'master' into careminsterMelanie2012-02-181-12/+28
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * If shape properties fail SOP parsing (e.g. due to commas instead of decimal ↵Justin Clark-Casey (justincc)2012-02-161-12/+22
| | | | | | | | | | | | points) print out one short message listing the failing node names rather than lots of exceptions. Adds skeleton bad float values deserialization test
* | Merge branch 'master' into careminsterMelanie2012-02-151-5/+9
|\ \ | |/
| * On object deserialization, go back to logging errors at DEBUG level rather ↵Justin Clark-Casey (justincc)2012-02-131-5/+9
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-02-041-74/+29
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-74/+29
| | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
| * Improve reliability of script state saving by covering various savingMelanie2012-02-021-4/+1
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | Improve reliability of script state saving by covering various savingMelanie2012-02-021-4/+1
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | Merge branch 'master' into careminsterMelanie2012-01-281-5/+15
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add experimental --publish option to "save oar" so that OARs reloaded to the ↵Justin Clark-Casey (justincc)2012-01-281-5/+15
| | | | | | | | same grid don't have the publisher as owner.
* | Merge branch 'master' into careminsterMelanie2012-01-121-5/+5
|\ \ | |/
| * 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.
| * If deserializing a scene object fails during IAR load then ignore the object ↵Justin Clark-Casey (justincc)2012-01-111-1/+1
| | | | | | | | rather than halting the IAR load with an exception.
* | Merge branch 'master' into careminsterMelanie2012-01-051-4/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Access to these static methods to serialize objects are useful outside of ↵Dan Lake2012-01-031-4/+4
| | | | | | | | serializer
* | Serialize the Volume Detect fieldMelanie2011-12-051-1/+8
| |
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-12-21 11:06:38 +0000