0ad9366abb
In InventoryAccessModule.RezObject, move the calling of AddNewSceneObject to the later part of
...
the function, so that the object's most properties have values already set when AddNewSceneObject
is called, which will trigger RegionSyncModule.SendNewObject to sync across scene copies.
2011-03-23 10:23:13 -07:00
71566e31c2
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into sceneapi
2011-03-21 15:22:52 -07:00
6e13ddf072
Added Mic's update logging patch
2011-03-21 15:21:55 -07:00
fb8a91bc8d
Removed some debug logs, and changed some from Debug to DebugFormat.
2011-03-21 14:51:03 -07:00
83b4d4121e
Added CopyRight disclaimers in RegionSyncModule files.
2011-03-18 13:59:33 -07:00
9704793a1c
Refreshed from dev, fixed merge problems with packet category logging. (by removing the debug feature)
2011-03-18 12:36:09 -07:00
b7dc2af5e6
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-17 17:20:58 -07:00
4076cb4a3c
Fixed a bug in RegionSyncModule.SendSceneUpdates: if there are no SyncConnectors in connection,
...
clear the update list before return.
Also, if a SyncConnector receives a request GetObject, only sends back NewObject to that SyncConnector.
2011-03-17 17:18:16 -07:00
ab6b9e5812
Changed warning to debug message for outgoing packet queues
2011-03-17 14:10:01 -07:00
6e251b13c4
Merge branch 'dev' into collisionevent
2011-03-17 10:31:16 -07:00
74903876eb
Collision events generated by physics engine and processed by script engine.
2011-03-17 10:29:03 -07:00
0df0e92ff0
In RegionSyncModule.DoInitialSync(), calling DeleteAllSceneObjectsBySync() instead of DeleteAllSceneObjects().
2011-03-16 16:36:54 -07:00
271f460bae
Handler of SymmetricSyncMessage.MsgType.UpdatedObject changed to HandleUpdateObjectBySynchronization,
...
that is, since we add objects in scene by sending around NewObject, we no longer "add" objects after
receiving UpdateObject.
Also, ProcessBackup is now only executed by Persistece Actor (ScenePersistenceSyncModule, if configured
to run, will set each SOG's ToPersistObjectState to true).
2011-03-16 11:32:26 -07:00
a8c722bead
Added code to encode and decode all object properties, including those in Physics bucket,
...
to sending and handling received NewObject sync message.
Also, NewObject, RemoveObject, and LinkObject are now all sent out via
SendSceneEventToRelevantSyncConnectors, that is, they are sent out on wire right away,
not enqueue first.
2011-03-16 09:32:27 -07:00
04ef2366c2
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-03-15 11:26:46 -07:00
3d17bd5654
Reimplement logic in RegionSyncModule so that a SyncRelay node (e.g. PSA) only sends out updates for a bucket
...
that has properties updated in the last update interval: the previous implemenation has some flaws in design.
2011-03-15 11:21:46 -07:00
afca24acbe
Added some debugging for queues. Temporary change
2011-03-14 22:37:09 -07:00
10e405704a
Added some debugging for queues. Temporary change
2011-03-14 22:17:51 -07:00
7bcab8e975
Added some debugging for queues. Temporary change
2011-03-14 21:41:47 -07:00
7a89cf5a68
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-14 12:52:52 -07:00
3bdc04acf3
Added some debugging for queues. Temporary change
2011-03-14 12:52:10 -07:00
d5acb9a214
Merge branch 'dev' into syncstats
2011-03-11 16:34:50 -08:00
4803745c0d
Added logic in RegionSyncModule so that a SyncRelay node (e.g. PSA) only sends out updates for a bucket
...
that has properties updated in the last update interval.
2011-03-11 16:29:10 -08:00
d70deaaa64
Merge branch 'dev' into syncstats
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-03-11 16:02:00 -08:00
e72f08e02a
Default physics logging to off
2011-03-11 15:56:33 -08:00
9edbbf2728
sync logging added to RegionSyncModule
2011-03-11 15:42:39 -08:00
37dd39fd5d
Added SendNewObject to explicitly send out NewObject sync message when new objects are added.
2011-03-11 15:39:06 -08:00
48ad2010e5
removed some debug message.
2011-03-11 13:54:09 -08:00
1ab4df9954
In RegionSyncModule.PrimUpdatesPhysicsBucketSender, if no PhysicsActor for the SOP, still sending out
...
"GroupPosition" and a few other properties in physics bucket. Sync'ing of phantom objects now seems working fine.
2011-03-11 11:50:46 -08:00
13798f9f7d
Fixed bugs in llCreateLink to sync LinkObject properly.
...
Also, added logs for debug purposes.
2011-03-11 09:22:32 -08:00
7f6529af4e
Merge branch 'dev' into syncstats
2011-03-10 14:13:41 -08:00
a1fa5c28c3
Add sync statistics collector class
2011-03-10 14:05:59 -08:00
cc2a679121
Sync statistics to a file
2011-03-10 14:04:10 -08:00
b848df2a3a
In LSL_Api.cs, no special checking of if ScriptEngineToSceneConnectorModule exist anymore --
...
async model is no longer used and we get rid of the old code.
2011-03-09 17:16:03 -08:00
e4bdaaaa83
Added SyncStateReport function in RegionSyncModule to do some preliminary sync state comparison.
2011-03-09 16:31:53 -08:00
d514c31cc2
Merge branch 'dev' into syncstats
2011-03-08 14:23:41 -08:00
e0f28ac5ba
Basic SyncConnector status for ssync status
2011-03-08 12:59:46 -08:00
ae258a21e4
Added code to propogate event OnChatBroadcast (llOwnerSay is handled by this), and consolidate code
...
with events OnChatFromClient and OnChatFromWorld.
2011-03-08 11:00:52 -08:00
052af34a52
Added Shape as one of the properties just updated in MoapModule.SetMediaEntry.
2011-03-07 16:24:48 -08:00
b1114dcb98
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
2011-03-07 16:03:50 -08:00
e21176f974
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-07 15:58:36 -08:00
7210b7f517
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-03-07 15:57:31 -08:00
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
9b345ebf73
factor out SetPartMediaFlags() function in MoapModule.
2011-03-05 02:42:47 +00:00
2e46027c14
Construct test load iar only once and reuse for each test, rather than recreating it every time
2011-03-05 02:34:44 +00:00
9e579a7891
Fold ClearMediaEntry() back into SetMediaEntry()
2011-03-05 02:21:53 +00:00
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
12d5a20094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-04 17:18:49 -08:00
3c0d607f45
Changed order of checks for local regions when processing
...
AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.
2011-03-04 17:17:53 -08:00
8efb01b3df
minor: remove some mono compiler warnings
2011-03-05 01:15:27 +00:00
Huaiyu (Kitty) Liu