Commit Graph

14384 Commits (ae258a21e4546a28b788d994d8d79c90df5a4c73)

Author SHA1 Message Date
Huaiyu (Kitty) Liu e4ab31e004 merged in Kitty's code on propogating events and handling remote events 2011-01-06 10:46:06 -08:00
Dan Lake 247bed199f Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev 2011-01-06 09:21:21 -08:00
Dan Lake f2013d3c93 Updates for appearance and attachments 2011-01-06 09:20:59 -08:00
Robert Adams 2152a5ab7b Merge branch 'dev' into physics 2011-01-05 16:49:28 -08:00
Robert Adams 9669aa93f8 Added region specification to configuration of SyncListenerIPAddress and SyncListenerPort 2011-01-05 16:45:08 -08:00
Huaiyu (Kitty) Liu 731a09bf95 Added symc sync handlers for event ScriptReset. 2011-01-05 16:39:53 -08:00
Robert Adams 251592e54a Code cleanup for better exception processing when looking for a scenePresence when routing a physics event 2011-01-05 16:22:27 -08:00
Huaiyu (Kitty) Liu 837a77b24a Abandoned the previous temporary solution of propogating events. Instead, rename legacy (Scene)EventManager
as EventManagerBase, and implement a new EventManager, to enable handling local/remote events differently.
Handlers for UpdateScript has been implemented as a sample case.
2011-01-05 15:32:43 -08:00
Mic Bowman d3ebf64369 Merge branch 'master' into cmickeyb 2011-01-05 15:01:53 -08:00
Mic Bowman 0b44e99730 comment out a couple simian debug messages 2011-01-05 14:51:11 -08:00
Mic Bowman 984a9b4085 Added more performance checks to the HTTP server. Each request
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
Huaiyu (Kitty) Liu 9b34d50643 Tried a temporary solution for propogating events across actors. See OnUpdateScript handlers. 2011-01-05 13:46:48 -08:00
Diva Canto 17ebe8fb77 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-01-05 07:14:45 -08:00
Diva Canto 0c165bc421 Commented a verbose Debug message in LLUDPServer that got uncommented at some point. 2011-01-05 07:14:09 -08:00
Robert Adams 254436e914 Cause PhysicsterseUpdate event to happen in the persistance actor when the attributes are changed by the physics actor 2011-01-04 16:15:55 -08:00
Justin Clark-Casey (justincc) 4ac58093bf Make the default for the very verbose XMLRPC groups debug setting false rather than true! 2011-01-04 23:23:42 +00: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
Diva Canto fbde9b1136 Note to self: try to make only 3 things at the same time. 2011-01-04 11:33:15 -08:00
Diva Canto db55859125 Guard against null Animator. 2011-01-04 11:30:08 -08:00
Robert Adams 7441fbfa3a Merge branch 'dev' into physics
Conflicts:
	OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
2011-01-04 10:28:26 -08:00
Robert Adams 0dbd96a12f Modify remote physics configuration to work with new object sync. Remove some chatty debug messages 2011-01-04 10:19:21 -08:00
Huaiyu (Kitty) Liu d84e69fefe Added SymSync in config file. If SymSync = true, then code in the old sync module (asym sync) that handle object updates
are disabled. Then we effectively have new ways (RegionSyncModule) of handle object updates, and old ways of handling
avatar updates working together.
2011-01-04 10:12:35 -08:00
Mic Bowman 6a5d52b4c8 removed the early return on agentupdates, this was debugging code 2011-01-04 09:12:32 -08:00
Mic Bowman e0da281e3d Cleaned up debugging messages in the WebRequest handlers 2011-01-03 17:16:22 -08:00
Mic Bowman d3987024d7 Merge branch 'master' into cmickeyb 2011-01-03 17:05:24 -08:00
Robert Adams 7da71bd30d Merge branch 'dev' into physics 2011-01-03 15:42:17 -08:00
Huaiyu (Kitty) Liu f5df61162f Added a missing file: IRegionSyncModule.cs. 2011-01-03 15:35:16 -08:00
Robert Adams e68d9a25b1 Merge branch 'dev' into physics 2011-01-03 15:25:31 -08:00
Dan Lake 0b164072b3 Merge branch 'danmerge_symsync' into dev 2011-01-03 15:13:04 -08:00
Robert Adams ae8f8d60a6 remove some load balancing routine invocations to eliminate build breaks. Remove chatty grab debug messages 2011-01-03 12:21:38 -08:00
Dan Lake 7bec1f71cf Prevent position updates from being sent to remote simulation service. 2011-01-03 12:10:29 -08:00
Melanie 5286198650 Add permissions hooks for object transfers 2011-01-03 19:42:58 +00:00
Melanie 07cc032081 Allow cross-scope friendships to work, and also allow other cross scope name
resolution
2011-01-03 19:42:46 +00:00
Melanie e1664b8d38 Fix child agent scoping 2011-01-03 19:42:26 +00:00
Melanie c48ddbfef1 Fix scoping for prim region crossings 2011-01-03 19:41:02 +00:00
Melanie 9971766256 Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
2011-01-03 19:40:55 +00:00
Robert Adams be2af26231 Merge branch 'dev' into physics
Conflicts:
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-01-03 10:47:19 -08:00
Dan Lake a34e152e9b Additional debug text in ScenePresence.cs for appearance 2011-01-03 09:37:31 -08:00
Robert Adams 8aded5bdd0 Debug message in ODEPrim on object creation. Less restrictive on changed test when routing updates in ODEScene 2011-01-03 09:13:44 -08:00
Dan Lake f0c2fe6569 Fixed build problem from merge. Needed to add 2 new functions to RegionSyncAvatar.cs as part of IClientAPI interface. 2011-01-02 18:56:59 -08:00
Dan Lake adeab48e7e Merge branch 'master' into danmerge 2011-01-02 18:38:58 -08:00
Dan Lake 9df74cf726 The "show" command on scene does not ever seem to be called anywhere. Commenting out the implementation for now and everything still builds. Might be a patch for master or needs a way to call it. 2011-01-02 18:28:42 -08:00
Dan Lake a5c321a548 Added region name to RegionSync debug messages for cases when there are multiple regions being synced by a single simulator. 2011-01-02 18:27:45 -08:00
Mic Bowman df5e4a1e5b Standardize the way WebRequests are made in the SimulationServiceConnector. Added
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
Melanie 1f4d0ad460 Fix up a prior fix (refix the fixed fix :) 2010-12-30 02:31:05 +00:00
Melanie a32f80b9e3 Implement SendPlacesReply 2010-12-30 01:36:09 +00:00
Huaiyu (Kitty) Liu 5acaba2974 Added basic implementation for ClientManagerSyncModule and PhysicsEngineSyncModule. 2010-12-29 17:01:45 -08:00
Huaiyu (Kitty) Liu 2ce7d982fa Added functions to sync terrain updates. Either script engine or Scene can update terrain
and the other will be updated.
2010-12-29 13:41:51 -08:00
Diva Canto d42e0c39fc Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified. 2010-12-29 07:36:39 -08:00
Myan Thor 915c0b17b0 fixes a problem with ending slashes in GatekeeperService to verify session-addresses 2010-12-29 06:03:43 -08:00