Dan Lake
7bcab8e975
Added some debugging for queues. Temporary change
2011-03-14 21:41:47 -07:00
Dan Lake
7a89cf5a68
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-14 12:52:52 -07:00
Dan Lake
3bdc04acf3
Added some debugging for queues. Temporary change
2011-03-14 12:52:10 -07:00
Robert Adams
d5acb9a214
Merge branch 'dev' into syncstats
2011-03-11 16:34:50 -08:00
Huaiyu (Kitty) Liu
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
Robert Adams
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
Robert Adams
e72f08e02a
Default physics logging to off
2011-03-11 15:56:33 -08:00
Robert Adams
9edbbf2728
sync logging added to RegionSyncModule
2011-03-11 15:42:39 -08:00
Huaiyu (Kitty) Liu
37dd39fd5d
Added SendNewObject to explicitly send out NewObject sync message when new objects are added.
2011-03-11 15:39:06 -08:00
Huaiyu (Kitty) Liu
48ad2010e5
removed some debug message.
2011-03-11 13:54:09 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
13798f9f7d
Fixed bugs in llCreateLink to sync LinkObject properly.
...
Also, added logs for debug purposes.
2011-03-11 09:22:32 -08:00
Robert Adams
7f6529af4e
Merge branch 'dev' into syncstats
2011-03-10 14:13:41 -08:00
Robert Adams
a1fa5c28c3
Add sync statistics collector class
2011-03-10 14:05:59 -08:00
Robert Adams
cc2a679121
Sync statistics to a file
2011-03-10 14:04:10 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
e4bdaaaa83
Added SyncStateReport function in RegionSyncModule to do some preliminary sync state comparison.
2011-03-09 16:31:53 -08:00
Robert Adams
d514c31cc2
Merge branch 'dev' into syncstats
2011-03-08 14:23:41 -08:00
Robert Adams
e0f28ac5ba
Basic SyncConnector status for ssync status
2011-03-08 12:59:46 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
052af34a52
Added Shape as one of the properties just updated in MoapModule.SetMediaEntry.
2011-03-07 16:24:48 -08:00
Dan Lake
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
Dan Lake
e21176f974
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-07 15:58:36 -08:00
Dan Lake
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
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
Justin Clark-Casey (justincc)
9b345ebf73
factor out SetPartMediaFlags() function in MoapModule.
2011-03-05 02:42:47 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
9e579a7891
Fold ClearMediaEntry() back into SetMediaEntry()
2011-03-05 02:21:53 +00:00
Justin Clark-Casey (justincc)
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
Mic Bowman
12d5a20094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-04 17:18:49 -08:00
Mic Bowman
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
Justin Clark-Casey (justincc)
8efb01b3df
minor: remove some mono compiler warnings
2011-03-05 01:15:27 +00:00
Justin Clark-Casey (justincc)
72cb498fd0
minor: Make MoapModule namespace consistent with other modules
2011-03-05 01:13:59 +00:00
Justin Clark-Casey (justincc)
481ca910da
add test for MoapModule.SetMediaUrl()
2011-03-05 01:07:05 +00:00
Justin Clark-Casey (justincc)
3c89527b22
Fix bug where llSetPrimMediaParams() reported success but never set the media texture.
...
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script. This was being done when the viewer was setting them directly.
2011-03-05 00:06:51 +00:00
Robert Adams
59fbb9cbef
Restore physics bucket serialization that was lost in previous commit
2011-03-03 11:37:24 -08:00
Robert Adams
b76c233db3
Merge branch 'dev_kitty' into physbucket
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
2011-03-03 08:54:01 -08:00
Huaiyu (Kitty) Liu
91e8fc50d3
Change Constants.RegionSize back to 256.
2011-03-01 14:50:33 -08:00
Robert Adams
6b9d58b99b
Make PECharacter sync PhysActor info back to physics actor. Remove some chatty debug messages. Add checks to warn if PhysicsActor synchronization is acting on a prim rather than a character.
2011-03-01 12:42:05 -08:00
Diva Canto
b82b0b1677
Normalizing comparison to lower case, just in case ppl set their config vars inconsistently. (maybe related to mantis #5386 )
2011-03-01 09:20:50 -08:00
Robert Adams
400c9b5293
Using PhysActor sync for avatars and bucket sync for prims. Working with avatars kicking physical objects
2011-02-28 14:09:19 -08:00
Melanie
cea47491de
Fix a few little things
2011-02-27 19:49:23 +00:00
Robert Adams
11db34313d
Restore old PhysicsActor sync code. Not tested yet
2011-02-25 16:54:04 -08:00
Robert Adams
319c48f112
Restore old PhysActor synchronization routines
2011-02-25 16:30:52 -08:00
Huaiyu (Kitty) Liu
a5c55a19ef
Merge branch 'dev' into dev_kitty
2011-02-25 16:23:57 -08:00
Huaiyu (Kitty) Liu
f7de4f37ce
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-02-25 16:22:51 -08:00
Huaiyu (Kitty) Liu
9d613a20c0
Relocate functions within RegionSyncModule.cs: the IRegionSyncModule region now
...
only contains functions defined in IRegionSyncModule.
2011-02-25 16:20:58 -08:00
Robert Adams
153fd02f0f
Add SimianGridServiceConnector::LookupEndpoint to get info on a particular sync server endpoint
2011-02-25 16:03:35 -08:00
unknown
784cb6c95c
Changed some less important messages from Warn to Debug
2011-02-25 15:21:07 -08:00
Justin Clark-Casey (justincc)
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00:00