Commit Graph

14054 Commits (e9e36e2964e4d9778d34027947a645969c728946)

Author SHA1 Message Date
Dan Lake e9e36e2964 Merge branch 'prephysics' into dev 2011-01-19 13:06:28 -08:00
Dan Lake 7a1a21cd15 Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev 2011-01-19 13:04:09 -08:00
Dan Lake b02d3090b3 Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics 2011-01-19 13:02:50 -08:00
Dan Lake f09f74c224 Patches to appearance and inter-region comms 2011-01-19 13:02:08 -08:00
Robert Adams 8256caad3f Remove setting of localID on newly created avatar. This solves the case of later viewers in other regions not seeing position updates for other avatars. 2011-01-19 08:50:41 -08:00
Robert Adams c541b42f7e Converted PhysicsActor identification from localID to UUID 2011-01-18 16:52:37 -08:00
Robert Adams 42563e77fa Merge branch 'prephysics' into dev
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
2011-01-18 09:31:33 -08:00
Huaiyu (Kitty) Liu c8dc14fb01 Configuration of SyncListenerIPAddress, SyncListenerPort, ServerIPAddress, and
ServerPort is moved to Regions.ini.
2011-01-17 17:13:15 -08:00
Huaiyu (Kitty) Liu 719f59db3f Added code to propagate OnNewScript event, when client sends in RezScript request (e.g. add new script to a prim). 2011-01-14 16:58:06 -08:00
Huaiyu (Kitty) Liu 69476339df Merge branch 'prephysics_kitty' into prephysics 2011-01-14 09:56:43 -08:00
Huaiyu (Kitty) Liu 0be2fe7f13 Changed the way RemoveObject is handled: now Scene.DeleteSceneObject() calls RegionSyncModule to
send RemovedObject message to other actors for synchronization.
2011-01-13 15:36:44 -08:00
Huaiyu (Kitty) Liu c1e19ead74 Added ScheduleFullUpdate() in SceneObjectPart.AddInventoryItem(), to enable synchronization across actors. 2011-01-12 17:20:17 -08:00
Dan Lake e7e2a62641 Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics 2011-01-11 19:19:44 -08:00
Dan Lake 039d919284 RefreshAppearance now tries to find the local avatar a few times before it gives up. 2011-01-11 19:19:15 -08:00
Huaiyu (Kitty) Liu 9e08ede0bd Commented out DeleteAllSceneObjects in RegionSyncClient, and fixed a bug in "ssync stop". 2011-01-11 16:00:14 -08:00
Huaiyu (Kitty) Liu 95be9c1f7d Fixed a bug so that "ssync start" won't start new connections if a region is already synced. 2011-01-11 14:25:33 -08:00
Huaiyu (Kitty) Liu b5f1137a7d Merge branch 'prephysics_kitty' into prephysics 2011-01-11 12:35:58 -08:00
Huaiyu (Kitty) Liu b29e7c6e5e Let RegionSyncModule to automatically start synchronization when all region loading is done. 2011-01-11 12:33:32 -08:00
Dan Lake 86235e200e Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics 2011-01-11 12:25:10 -08:00
Dan Lake 217b28195c TEMP: Disable saving of appearance to Simian for demonstration purposed only. 2011-01-11 12:21:58 -08:00
Dan Lake 9d5888e0f6 Fixed typo in Region Sync Module debug message Log Headers. 2011-01-11 12:21:04 -08:00
Dan Lake b5463e042c Workaround for NaN in rotation update from PSA to CM. 2011-01-11 12:20:06 -08:00
Dan Lake ed380196ea Only AvatarFactory module should be calling ScenePresence.SendAppearanceToAllOtherAgents(). 2011-01-11 11:49:05 -08:00
Dan Lake 6a24d0eb2d Added missing lock in EventQueue Enqueue. 2011-01-11 11:40:14 -08:00
Huaiyu (Kitty) Liu f8a0de591d Handling RemovedObject as event, instead of as object-update as in the previous approach. 2011-01-10 16:30:42 -08:00
Huaiyu (Kitty) Liu 5c31e0bdd3 Enabled touch events (ObjectGrab, ObjectGrabbing, ObjectDeGrab) to be propagated to script engine and triggers script. 2011-01-10 14:14:40 -08:00
Huaiyu (Kitty) Liu 7eb9affbd3 Enabled chats from scripted objects to be propogated to other objects and avatars. 2011-01-07 15:08:12 -08:00
Huaiyu (Kitty) Liu 4bb99b3df5 Merge branch 'dev_kitty' into prephysics 2011-01-07 12:02:22 -08:00
Huaiyu (Kitty) Liu 739bb1dc43 Fixed a bug in deserialization during rezzing objects out of inventory: SceneObjecPart.SyncInfoUpdate() fixed. 2011-01-07 12:00:00 -08:00
Dan Lake 4f45dcf711 Commenting out verbose debug in SceneGraph.cs 2011-01-07 11:37:03 -08:00
Dan Lake 9d7fd472c0 Fixed a problem with PhysEngineToSceneConnectorModule.cs disabling regionsync when physics syncing is disabled. 2011-01-07 08:27:06 -08:00
Dan Lake 046ec22924 Modified debug messages 2011-01-06 19:26:35 -08:00
Dan Lake a7ec095063 Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev 2011-01-06 17:56:18 -08:00
Robert Adams ce4b095a1a Merge branch 'physics' into dev 2011-01-06 17:43:41 -08:00
Dan Lake 17504fcccb Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev 2011-01-06 17:33:13 -08:00
Dan Lake a339598bad Added scene name to config options 2011-01-06 17:32:10 -08:00
Huaiyu (Kitty) Liu 9ecf1c21aa Enabled chats (avatar to avatar, avatar to object) to work under the new EventManager (Dan's old way of
propagating chats is disabled by not subscribing to OnChatFromClientRaw in RegionSyncClient and
not subscribing to OnChatFromClientRaw/OnChatFromClientRaw in RegionSyncClientView.

Also, fixed a few minor bugs:
1. GetRemoteSyncListenerInfo() in RegionSyncModule fixed.
2. ActorID sent out when an actor connects to ScenePersistence actor.
2011-01-06 17:02:46 -08:00
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
Huaiyu (Kitty) Liu 9b34d50643 Tried a temporary solution for propogating events across actors. See OnUpdateScript handlers. 2011-01-05 13:46:48 -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
Huaiyu (Kitty) Liu 42645acab9 Fix a bug and link-set objects can now be synched correctly. 2011-01-04 14:19:44 -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