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
Melanie
f25749f025
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-03-27 21:22:31 +01:00
Justin Clark-Casey (justincc)
435d72f106
Add SignpostMarv to contributors
2011-03-26 02:46:00 +00:00
Justin Clark-Casey (justincc)
797128a6ad
Rename some member fields to standard m_ OpenSim code convention
2011-03-26 02:44:46 +00:00
Justin Clark-Casey (justincc)
83f48c26d6
add header file
2011-03-26 02:43:41 +00:00
Justin Clark-Casey (justincc)
de0730a54c
Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure.
2011-03-26 02:42:50 +00:00
SignpostMarv Martin
361b3e7ab8
Removing hard-coded plugin loading in favour of direct class instantiation
2011-03-26 02:39:30 +00:00
SignpostMarv Martin
3f4be42a87
Altering log feedback
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
e93531e124
Fixing bug that occurs when using web login- the result was not checked
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
3bc859a834
Making combined auth service re-use the existing auth services instead of duplicating code
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
0e808950fb
InfoFormat > DebugFormat
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
6153c45973
LLLoginHandlers now supports both password & web login
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00