admin/opensim
1
0
Fork 0
mirror of git://opensimulator.org/git/opensim synced 2026-08-16 18:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,331 Commits 112 Branches 81 Tags
b76c233db3bdb4b71fedcfbf05ab408984577b59
Commit Graph
37 Commits
Author SHA1 Message Date
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
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
unknown 784cb6c95c Changed some less important messages from Warn to Debug 2011-02-25 15:21:07 -08:00
Robert Adams 1ff16c93a3 Another attempt to add SOG/SOP to ScenePresence so it can be handled by bucket update code 2011-02-18 17:16:57 -08:00
Robert Adams c9c94a5f23 Physics bucket packing and unpacking 2011-02-16 17:11:16 -08:00
Robert Adams 3123671651 Configuration of PhysicsSyncServerAddress and port in regions file 2011-01-21 12:28:12 -08:00
Huaiyu (Kitty) Liu 677889d3b6 Get rid of SymSync in OpenSim.ini, old way of object sync no longer works (via RegionSyncServer). 
SyncListenerAddress/Port renamed as SyncServerAddress/Port.
 2011-01-20 16:19:51 -08:00
Huaiyu (Kitty) Liu 43edf89a34 Changes names in Regions.ini, and added one more config item: SyncQuarkLocation. 2011-01-20 12:05:10 -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
Dan Lake b5463e042c Workaround for NaN in rotation update from PSA to CM. 2011-01-11 12:20:06 -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 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
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
Robert Adams e68d9a25b1 Merge branch 'dev' into physics 2011-01-03 15:25:31 -08: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
Huaiyu (Kitty) Liu cb49cfe6c5 Added "[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]" to 
SymmetricSync modules that implement INonSharedRegionModule. They now start running as a region is loaded.
 2010-12-21 13:23:52 -08:00
Robert Adams a2ca47d7eb Add parameter and code for AgentID to track bucket changes. Added ground collision so walking now works 2010-12-21 13:19:09 -08:00
Robert Adams 7c6bca1668 physics messages sync'ing both ways. Value change not happening 2010-12-14 15:31:00 -08:00
Dan Lake dc86adbd17 Fixing up Appearance handling in Region Sync modules and connectors. 2010-12-09 15:07:42 -08:00
Robert Adams 24bef963c7 Initial connection of phys actor 2010-12-06 10:57:39 -08:00
Huaiyu (Kitty) Liu f8ccfaf046 Fixed a few conflicts with Dan's code (earlier conflict resolution by Dan broke 
remote script engine's execution) to make remote script engine execute as it did in
    the implementation in Country Fair 2010 demo.
 2010-11-12 15:50:21 -08:00
Robert Adams 46a01d9550 Animations to multiple CMs (including idle anims) are working 2010-10-26 12:22:09 -07:00
Robert Adams 9f515cb623 Partial passing of StartAnim and StopAnim through CM 2010-10-25 15:52:41 -07:00
Robert Adams 838ffc27ed Create full updates for making sit complete 2010-10-25 13:32:53 -07:00
Robert Adams de9427e545 Border crossing in multi-region CMs and many debug messages for appearance 2010-10-14 14:31:28 -07:00
Dan Lake f5d25981ac Merged with Kitty's Script engine code. 2010-09-23 16:32:38 -07:00
Dan Lake 8f8ef75034 Merged with main AND partial implementation of teleport based load balancing. Did not intend to combine the merge with these changes. 2010-08-16 10:23:50 -07:00
Dan Lake 9ada2a1f34 Client manager changes as of R@I 2010-07-19 13:03:04 -07:00
Dan Lake 6818427f1c More Scene API changes 2010-06-01 16:13:38 -07:00
Dan Lake 2283b85bcf Some updates for client manager 2010-04-30 08:13:02 -07:00
Dan Lake 8027b7c1a5 Merged from master 2010-03-24 10:50:42 -07:00
Dan Lake 4216eacd6c Some work on sceneapi 2010-03-23 16:30:56 -07:00