Dan Lake
30a9cee425
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/UndoState.cs
2011-07-20 14:35:06 -07:00
Justin Clark-Casey (justincc)
86f45f6fe7
remove undo state storage in a few places where it's pointless
...
no functional effect - existing bugs still remain
2011-07-19 01:24:43 +01:00
Dan Lake
7447765f4d
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
2011-07-15 15:32:42 -07:00
Justin Clark-Casey (justincc)
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
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.
2011-07-09 00:35:30 +01:00
Dan Lake
8791e5dac0
Working out merge errors with master
2011-06-15 13:43:02 -07:00
Dan Lake
9c15c8897e
Merge branch 'master' into dev
2011-06-14 23:16:48 -07:00
Dan Lake
32ddcefaca
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
2011-06-14 23:15:34 -07:00
Justin Clark-Casey (justincc)
fc7e17baf7
When serializing objects, stop accidentally using the green text colour value for alpha
...
This addresses http://opensimulator.org/mantis/view.php?id=5111
2011-06-10 21:49:25 +01:00
Justin Clark-Casey (justincc)
e9988a3728
Make sure culture is en-US when saving archive related xml.
...
This might resolve http://opensimulator.org/mantis/view.php?id=5475
2011-05-27 21:19:20 +01:00
Justin Clark-Casey (justincc)
4e4db749eb
If parsing fails in the primitive base shape (which prints out a debug log message), also print out the name and uuid of the part containing this shape.
...
This is to help in diagnosing parsing failures.
2011-05-27 20:59:35 +01:00
Melanie
e398c33648
Add PayPrice to serialization format Xml2
2011-05-25 12:17:46 +01:00
Huaiyu (Kitty) Liu
8497ecd28d
Removed DSG added code for some properties that were not included in legacy SceneObjectSerializer implementation.
...
The file now is almost back to its legacy shape, with a few DSG edits.
2011-05-11 11:37:32 -07:00
Huaiyu (Kitty) Liu
854cb58d6d
Revised SetSOPPropertyValue in RegionSyncModule.cs:
...
added calling aggregateScriptEventSubscriptions() after SOP.AggregateScriptEvents is set.
for properties AttachedAvatar and AttachmentPoint, do extra work besides copying the property values.
Propogation of colission event and attachment (attached after avatar login) both working now.
2011-05-04 14:36:18 -07:00
Huaiyu (Kitty) Liu
cd70c3ff56
Merge branch 'dev_perPropertyTS' into dev
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2011-05-03 16:55:23 -07:00
Huaiyu (Kitty) Liu
1c1d3893fc
DelinkFromGroup now calls AddNewSceneObjectByDelink, to avoid calling SyncNewObject later.
...
Also, replace all "SYMMETRIC SYNC" with "DSG SYNC" in comments.
2011-04-20 14:59:06 -07:00
Dan Lake
da6044b6be
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-04-19 11:52:25 -07:00
Huaiyu (Kitty) Liu
3d7cece491
Include serialization of Scale in SOP.Shape (it's a sub property in Shape, and also a seperate SOP property,
...
both pointing to the same copy), so that now serialization of Shape has all its sub properties.
2011-04-19 11:11:14 -07:00
Justin Clark-Casey (justincc)
58efd761d1
Add coalesced scene objects class and serializer. This is currently only 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.
2011-04-13 21:17:43 +01:00
Diva Canto
5c870fce54
Bug fix in object serialization -- sculpt data was wrong.
2011-04-12 19:45:33 -07:00
Huaiyu (Kitty) Liu
2f41b216d3
Updated PrimSyncInfo.CompareAndUpdateHashedValueByLocal, to overwrite SOP's
...
properties Shape and TaskInventory if PrimSyncInfo's value has newer timestamp.
2011-04-08 15:55:40 -07:00
Huaiyu (Kitty) Liu
2dccc3205d
Implemente PrimSyncInfo.CompareAndUpdateHashedValueByLocal, updated UpdatePropertiesByLocal
...
and a few update related functions in PrimSyncInfo.
2011-04-08 15:08:56 -07:00
Huaiyu (Kitty) Liu
3fe31ad457
Added back the LocalFlags as one of the SOP properties to be synced, so that script events such as touch is propogated properly.
...
Also removed some debug messages.
2011-03-07 15:51:59 -08:00
Huaiyu (Kitty) Liu
3d1048f1e2
In SOG.UpdateGroupPosition, added AttachedPos as an updated property is the object is an attachment.
2011-02-16 16:57:47 -08:00
Huaiyu (Kitty) Liu
7b9bd89a5c
Made sure IsAttachment is set only after AttachedAvatar is set. Also, in GroupPosition get, added checking of "if m_parentGroup==null".
2011-02-16 15:42:10 -08:00
Huaiyu (Kitty) Liu
f99b516eec
Added serialization/deserilaization of Attachment related SOP properties to sync AttachObject.
2011-02-16 14:29:08 -08:00
Huaiyu (Kitty) Liu
3cd1ec8752
Renamed SOP and SOPInventory as SOPBase and SOPInventoryBase, and define new SOP and SOPInventory. The latters
...
will invoke UpdateBucketSyncInfo the set functions of their properties, while the base classes won't.
2011-02-09 17:17:16 -08:00
Huaiyu (Kitty) Liu
2dc857b31d
Added code to serialization/deserialize LocalFlags. Need further testing to see if it's necessary.
2011-02-08 15:55:00 -08:00
Huaiyu (Kitty) Liu
62a9e0b7c4
No longer calling SyncInfoUpdate to update timestamp. Bucket based concurrency control now in place for a few physics properties
...
whose SetXXX() functions have been implemented in SceneObjectPart.
2011-02-03 17:21:00 -08:00
Huaiyu (Kitty) Liu
97b01dcf75
check in updates in enabling bucket based synchronization.
2011-02-03 12:01:08 -08:00
Dan Lake
cf15fc0b97
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-01-24 20:03:20 -08:00
Huaiyu (Kitty) Liu
5c31e0bdd3
Enabled touch events (ObjectGrab, ObjectGrabbing, ObjectDeGrab) to be propagated to script engine and triggers script.
2011-01-10 14:14:40 -08:00
Diva Canto
eab0951a59
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
...
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
2011-01-08 15:49:51 -08:00
Huaiyu (Kitty) Liu
42645acab9
Fix a bug and link-set objects can now be synched correctly.
2011-01-04 14:19:44 -08:00
Dan Lake
0b164072b3
Merge branch 'danmerge_symsync' into dev
2011-01-03 15:13:04 -08:00
Huaiyu (Kitty) Liu
f10059ccd9
1. Added ActorID to IDSGActorSyncModule and the modules that implements this interface.
...
2. Added LastUpdateTimeStamp and LastUpdateActorID to SceneObjectPart. Also added functions to
serialize and de-serialize the two new members.
2010-12-27 12:15:39 -08:00
Huaiyu (Kitty) Liu
650b0bfe54
1. Restored SceneObjectSerializer.SOGToXml2() as in opensim trunk (master), so that objects
...
are serialized properly.
2. Added code to pass ActorType from a particular ActorSyncModule to RegionSyncModule.
2010-12-23 14:06:33 -08:00
Justin Clark-Casey (justincc)
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
Dan Lake
c7923338bc
Merge branch 'master' into danmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSim.exe.config
2010-12-09 15:49:40 -08:00
Dan Lake
681190f682
Merge branch 'master' into danmerge
...
Conflicts:
.nant/local.include
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
bin/config-include/SimianGrid.ini
prebuild.xml
2010-11-30 17:36:36 -08:00
Diva Canto
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
Diva Canto
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08:00
Diva Canto
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems 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).
2010-11-21 17:19:24 -08:00
Diva Canto
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. 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.
2010-11-21 13:16:52 -08:00
Melanie
98ba079e95
Diva needs a spanking! Serializing OldItemID breaks script state persistence in agent inventory.
2010-11-16 01:35:16 +00:00
Diva Canto
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
Jeff Ames
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
Diva Canto
627d1a42fe
Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object.
2010-10-23 20:39:41 -07:00
Diva Canto
8731c2be11
It looks like Vector3s also got written down in lower case at some point in 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.
2010-10-19 15:16:29 -07:00
Diva Canto
8acac3d07f
Another take related to the previous commit.
2010-10-19 15:07:15 -07:00
Diva Canto
3b2d9a9939
Added code to quaternion deserialization to try to cope with an exception 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.
2010-10-19 14:37:03 -07:00