aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization (follow)
Commit message (Collapse)AuthorAgeFilesLines
* fix placement of xml ReadEndElement()UbitUmarov2017-07-161-2/+1
|
* store kfm on inventory. this may still be a bit confusing on rezUbitUmarov2017-07-161-0/+23
|
* replace the wrong libOMV user modifiable Utils.EnUSCulture by our own no ↵UbitUmarov2017-07-132-41/+41
| | | | User modifiable Culture.FormatProvider, and also for internal coerence. We do use the libomv on other code paths, so that must be fixed
* add more missing en-us culture on scene serializer writesUbitUmarov2017-07-132-31/+32
|
* still losing time with of halcyon incompatibile oars... cathch exceptions of ↵UbitUmarov2017-06-091-8/+6
| | | | the function that actually throws; Reduce log spam; don't let a broken MOAP stop all object deserialization. Fixing MOAP does not mean halcyon oars issues are fixed, just one. And really we should not even try to go against halcyon decison to be incompatible.(our MOAP encoding did not change since 2010)
* Another attempt at parsing MOAP <Media> elements in OAR files.Robert Adams2017-06-081-1/+22
| | | | | | | | | | Seems there are multiple interpretations of the format of the content of the <Media> element in OAR files. OpenSimulator (for reasons lost in the mist of time) escapes the XML in the element and then reparses it was a separate XmlReader. Other simulators fill the <Media> element with regular XML. This patch parses the <Media> escaped XML content as it always has and, if the parsing fails, falls back to trying to parse the pure XML.
* revert fa5bf4fd0bb6a855eacdb7b5eec9cd71ad9bf606 for testUbitUmarov2017-06-081-2/+1
|
* Correct parsing of 'Media' XML element in PrimitiveBaseShape when reading an ↵Robert Adams2017-06-041-1/+2
| | | | | | | | | | | OAR file. The code used to call Serializer.ReadElementContentAsString() and then expected to pass the XML to PrimitiveBaseShape.FromXml to parse. This would throw as ReadElementContentAsString does not allow any children of the element. Reading with Serializer.ReadInnerXml() was the fix. This was only not a problem because most often shapes don't have media and most simulators don't output anything if the media array is empty.
* move deep effective permissions aggregation to first time use and not on ↵UbitUmarov2017-05-042-3/+3
| | | | changes. There flag it is need with InvalidateDeepEffectivePerms(). Add config options PropagateGroupShareOutwards and PropagateAnyOneOutwards
* store the physics inertia override in Mysql and add it to serializer. run ↵UbitUmarov2017-04-011-1/+22
| | | | prebuild is required
* add more calls to effective permissions aggregation, some paths may still be ↵UbitUmarov2017-01-172-2/+4
| | | | missing on objects changes, but remove the aggregation on check paths, so all can be tested.
* Massive tab and trailing space cleanupMelanie Thielker2017-01-052-44/+44
|
* The new Constant: integer OBJECT_REZZER_KEY = 32;Mandarinka Tasty2016-12-041-0/+9
| | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* mantis 7656, partialy apply patch, changing the start scripts for nowUbitUmarov2016-11-261-0/+1
|
* Can't do it do it this low in the stack. Attachments on teleports apparently ↵Diva Canto2016-06-221-6/+1
| | | | | | | | | rely on State being != 0. Revert "Mantis #7932: Some objects were being serialized with PCode=9 and State != 0 (meaning attachments). That should never happen." This reverts commit f19199cf4a6ef9cdcfbdbff3a1f604f595216f65.
* Mantis #7932: Some objects were being serialized with PCode=9 and State != 0 ↵Diva Canto2016-06-211-1/+6
| | | | (meaning attachments). That should never happen.
* 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
| |\ \ \ \ \ \ \ \