aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization (follow)
Commit message (Collapse)AuthorAgeFilesLines
* add axis locks to sop serializer. Now they are also saved to inventoryUbitUmarov2015-10-201-0/+8
|
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-1/+1
|\ | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * More namespace and dll name changes. Still no functional changes.Diva Canto2015-08-301-1/+1
| |
| * Renamed the namespaces tooDiva Canto2015-08-301-1/+1
| |
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-34/+14
| |
* | bad merge?UbitUmarov2015-09-011-11/+130
|\ \ | |/ |/|
| * try to implement core load oar optionsUbitUmarov2015-08-241-0/+65
| |
| * always write physicsShapeType on sop serialization since default valueUbitUmarov2014-11-031-2/+1
| | | | | | | | can't be guessed in some cases
| * remove forgotten linesUbitUmarov2014-07-271-7/+0
| |
| * serialize sound parameters for llLoopSoundUbitUmarov2014-07-271-1/+48
| |
| * Merge branch 'master' into careminsterMelanie2013-11-231-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * \ Merge branch 'master' into careminsterMelanie2013-10-041-0/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-06-301-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-02-081-4/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | | | | Rename Bounciness to RestitutionMelanie2013-02-071-3/+3
| | | | | |
| * | | | | Merge branch 'master' into careminsterMelanie2013-02-051-0/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | | | | A few more changes to keyframesUbitUmarov2012-08-291-1/+1
| | | | | | |
| * | | | | | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing...
| * | | | | | Add Camera Offsets to serializationMelanie2012-08-211-0/+14
| | | | | | |
| * | | | | | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-07-111-9/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| | * | | | | | Change semantics of FromXML on vehicle data to make the serializer a bit cleanerMelanie2012-07-071-6/+5
| | | | | | | |
| | * | | | | | Add saving vehicle physics data to the databaseMelanie2012-07-071-4/+4
| | | | | | | |
| * | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-162-113/+4
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2012-02-151-5/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-041-74/+29
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-121-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-051-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Resolve merge commits, stage 1Tom2011-09-041-26/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorroot2011-07-091-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-5/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Persist Buoyancy in inventoryMelanie2011-06-021-0/+9
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add PayPrice to serialization format Xml2Melanie2011-05-251-1/+36
| | | | | | | | | | | | | | | | | | | |
generated by cgit v1.1 at 2024-12-30 05:32:49 +0000