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
Huaiyu (Kitty) Liu
a5ebd04d9d
Fixed code in SyncDeLinkObject and HandleSyncDelinkObject. Delinking a few linked objects seems working.
2011-04-19 15:55:04 -07:00
Huaiyu (Kitty) Liu
3676b5fbef
1. Replaced SendLinkObject and SendDeLinkObject with SyncLinkObject and SyncDeLinkObject
...
2. Replaced HandleLinkObject and HandleDelinkObject with HandleSyncLinkObject and HandleSyncDelinkObject.
LinkObject seems sync'ed well across actors.
2011-04-19 14:49:47 -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
Huaiyu (Kitty) Liu
85085977ac
Fixed a bug in ScheduleTerseUpdate, and added a few debug lines.
2011-04-19 09:52:55 -07:00
Huaiyu (Kitty) Liu
28f401d95a
Added RegionSyncModule.ProcessAndEnqueuePrimUpdatesBySync, and revised functions relavant
...
to processing and forwarding prim updates. Code good for 2 CM and PSA to sync on NewObject
and UpdatedPrimProperties.
2011-04-18 15:54:24 -07:00
Huaiyu (Kitty) Liu
8b08e4b176
Added sync message type UpdatedPrimProperties, to send prim property updates.
...
Sender/receiver functions most in place, need more testing.
2011-04-15 17:13:56 -07:00
Huaiyu (Kitty) Liu
e84a7157b4
Added SyncDeleteObject to replace calling to SendDeleteObject.
2011-04-15 15:00:02 -07:00
Huaiyu (Kitty) Liu
21c48088d8
Added SyncNewObject() to IRegionSyncModule, to be called when new object is
...
added to local SceneObject (by local operation, not by receiving sync message).
Code seems good for initial sync when one CM connects to PSA.
2011-04-15 12:15:28 -07:00
Huaiyu (Kitty) Liu
9dfc0e92b8
Changed Enum type SceneObjectPartProperties to SceneObjectPartSyncProperties,
...
to indicate they are the properties synchronzed by the sync protocol.
Also, added UUID to PrimSyncInfo.
Encode/Decode SOP to/from OSDmap seems working fine now.
2011-04-15 10:42:57 -07:00
Huaiyu (Kitty) Liu
d0938f57eb
Added PrimSyncInfo.SetSOPPropertyValue(), and fixed bugs in decoding SOP (PhysActor properties).
2011-04-14 17:09:50 -07:00
Huaiyu (Kitty) Liu
b9bfe6ba51
Fixed bugs in encoding/decoding SOG and SOPs, with per property sync info.
2011-04-13 13:43:25 -07:00
Huaiyu (Kitty) Liu
c244bbe143
Majority of SOP encoding/decoding (per property and SyncInfo based) functions are in place. Need testing.
2011-04-12 15:05:51 -07:00
Huaiyu (Kitty) Liu
9d3de471a5
SyncOutPrimUpdates linked with EncodePrimProperties and SendPrimUpdateToRelevantSyncConnectors.
2011-04-11 15:43:58 -07:00
Huaiyu (Kitty) Liu
a06dad37fd
Added ProcessAndEnqueuePrimUpdateByLocal and SyncOutPrimUpdates to
...
RegionSyncModule, and PrimSyncInfo.PropertyToOSD.
2011-04-11 14:36:38 -07:00
Huaiyu (Kitty) Liu
a06ddb9e88
Started to link RegionSyncModule.RecordPrimUpdatesByLocal with functions
...
in PrimSyncInfoManager. To to finished.
2011-04-08 17:10:09 -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
7c033f9d08
Added calling ScheduleFullUpdate() after SendFullUpdateToAllClients() is called in
...
several places in LSL_Api.cs.
2011-04-08 15:16:39 -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
2f17a9d224
Added more functions to PrimSyncInfo, and added class PrimSyncInfoManager.
...
Also, commented out a few not sync-relavent properties from SceneObjectPartProperties.
2011-04-07 15:34:09 -07:00
Huaiyu (Kitty) Liu
fe3d4ec9a8
Re-implemented SOP.ScheduleFullUpdate and SOP.ScheduleTerseUpdate, calling RecordPrimUpdatesByLocal
...
to record updated values and timestamp of SOP's updated properties.
Also, removed some code that had been commented out before.
2011-04-06 14:38:14 -07:00
Huaiyu (Kitty) Liu
2bea8bb4bc
Added class PropertySyncInfo and PrimSyncInfo in RegionSyncModule.
2011-04-06 12:23:04 -07:00
Robert Adams
e5a022c8d7
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-04-04 11:26:50 -07:00
Robert Adams
d71b49c2a4
Force HandleTerrainUpdate message to set the terrain no matter what the timestamp. This temp fix allows the initial terrain update to be set.
2011-04-04 11:26:10 -07:00
Dan Lake
2d775f9a52
Disabled queue logging by default
2011-04-01 10:37:39 -07:00
Huaiyu (Kitty) Liu
2abffd867f
Fixed more bugs while merging in the functions from commit 5b79e15285
.
2011-03-31 16:45:12 -07:00
Huaiyu (Kitty) Liu
8df517454d
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-31 11:41:01 -07:00
Robert Adams
fa7a8fb9c1
Move event count from per connection to per event
2011-03-31 10:22:46 -07:00
Huaiyu (Kitty) Liu
170a230e51
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-29 17:13:15 -07:00
Huaiyu (Kitty) Liu
cce9a12dbe
Fixed a few bugs introduced by my last commit.
2011-03-29 17:11:58 -07:00
Dan Lake
ecee306d3c
Merge branch 'master' into dev
2011-03-29 16:46:35 -07:00
Dan Lake
a0be3e2c5f
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-03-29 16:45:30 -07:00
Justin Clark-Casey (justincc)
f7ed7fc05d
When a new parcel is created, make sure the prim counts are updated.
...
This is done by tainting the counts where appropriate
2011-03-30 00:42:02 +01:00
Dan Lake
fe623f0900
Updated dev code to work with latest changes in opensim master
2011-03-29 16:29:00 -07:00
Justin Clark-Casey (justincc)
8b16f7d976
(re)implement selected prim count.
...
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
2011-03-30 00:13:07 +01:00
Dan Lake
f89ae8700d
Merge branch 'master' into dev
2011-03-29 16:04:55 -07:00
Dan Lake
8e6425dad7
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-03-29 16:04:06 -07:00
Justin Clark-Casey (justincc)
f754dedbef
Merge branch 'primcounts'
2011-03-29 23:08:44 +01:00
Justin Clark-Casey (justincc)
fe258753a0
disable prim count debug logging temporarily
2011-03-29 23:07:01 +01:00
Dan Lake
396ea3ba65
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-03-29 14:58:23 -07:00
Huaiyu (Kitty) Liu
5b79e15285
Checked in Functions that encode/decode sync messages based on object/prim properties.
...
These functions will convert the GroupPosition or Postiion properties into/out of the encoding.
NewObjectMessageEncoder
GeneralBucketPropertiesEncoder
PhysicsBucketPropertiesEncoder
NewObjectMessageDecoder
GeneralBucketPropertiesDecoder
PhysicsBucketPropertiesDecoder
Also checked some changes to SendXXXToRelevantSyncConnectors functions.
2011-03-29 14:55:21 -07:00
Dan Lake
13057c3751
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-29 14:16:29 -07:00
Dan Lake
0445e6e251
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
2011-03-29 13:42:01 -07:00
Diva Canto
309eb712a3
Improvement over 2 commits ago: make the hyperlink check understand port 80.
2011-03-28 19:34:55 -07:00
Huaiyu (Kitty) Liu
eed53e8a56
Fixed terrain synchroniztion to work properly when clients edit the terrain via viewer.
2011-03-28 17:22:24 -07:00
Diva Canto
d3771e5366
Added code to load a terrain tile of tiff/jpg format. Previously it only worked for one single region.
2011-03-28 16:48:12 -07:00
Diva Canto
2d209d3844
Fix mantis #5413 . WARNING: new config variable in section [GridService] of the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples.
2011-03-28 16:46:04 -07:00
Marck
5a61c76455
The actual change to README.txt about running on Linux.
2011-03-28 13:35:31 +02:00
Marck
dd72a69ea5
More touchup for SQLite.
...
Apply the same change to both the 32-bit and 64-bit DLL target paths. This makes the previous addition to the instructions in the README for running on Linux unnecessary.
2011-03-28 13:13:21 +02:00
BlueWall
fe6900b305
Touchup for SQLite
2011-03-27 19:38:40 -04:00