Diva Canto
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
Diva Canto
54418c5e69
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
2010-12-23 10:05:08 -08:00
Melanie
26e601a776
Put back a commented section of code. With some viewers, object inventory
...
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
Teravus Ovares (Dan Olivares)
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
Diva Canto
862da9a55f
Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
2010-12-22 17:55:58 -08:00
Huaiyu (Kitty) Liu
dc6964444e
Two SyncConnectors now exchange RegionName and Terrian (Scene and Scriptengine tested).
2010-12-22 16:56:34 -08:00
Robert Adams
bdeeead120
Add physics actor taint setting after receiveing update values
2010-12-22 15:35:26 -08:00
Huaiyu (Kitty) Liu
f97fe18648
Code good for an actor (script engine tested) to connect to ScenePersistence for synchronization.
...
Need to work on data transmission along the connection as next step.
2010-12-22 11:41:31 -08:00
Melanie
f29675bf87
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-22 17:35:12 +00:00
Diva Canto
2d8f448322
Fixed wrong argument cardinality in debug message.
2010-12-22 10:42:29 -08:00
Melanie
990e73d7cb
Fix a broken format on an error message. Also replace yet another e.Message
...
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
Huaiyu (Kitty) Liu
c1af982ff4
Added code to initiate listener or start connecting to remote listeners.
2010-12-21 17:15:30 -08:00
Teravus Ovares (Dan Olivares)
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
Melanie
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
Melanie
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
Melanie
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00: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
Melanie
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
Melanie
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
Huaiyu (Kitty) Liu
e96625c8ca
Started to implement Symmetric Sync between all actors. Reserved all old code for asym-sync implemented.
...
Created a subdir, SymmetricSync/ under OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/. Newly
added files are kept here.
See SymmetricSyncDesign.pptx for the high level SW arch design. Available at \\jfea1pub303\PlanetLAB\vwi\sceneapi.
Added implementation of RegionSyncModule, SyncConnector, and ScenePersistenceSyncModule (this is ScenePersistence specific actions, e.g. message/event subscription).
2010-12-21 10:48:34 -08:00
Mic Bowman
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
Robert Adams
e1c3650634
Remove chatty debug messages. Damp update value checking. Physics sync message logging.
2010-12-20 14:06:14 -08:00
Diva Canto
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
Marck
711283d3ca
More changes to the long help text for console command link-region.
2010-12-20 02:50:19 +01:00
Marck
3b4af8a0dc
Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData.
2010-12-20 02:09:35 +01:00
Marck
2a40c8511a
Make long help text for new link-region command syntax more explicit.
2010-12-19 22:59:32 +01:00
Diva Canto
cf72fece6d
Replaced the HttpServer_OpenSim.dll with one compiled for .NET 3.5 (the last one was 4.0, and that doesn't work). Also added the corresponding .xml and .pdb, if that makes any difference.
2010-12-18 18:23:51 -08:00
Diva Canto
d576d7c0a6
Replaced HttpServer_OpenSim.dll with a version that locks certain ops in HttpForm -- mantis #5128 .
2010-12-18 17:36:37 -08:00
Justin Clark-Casey (justincc)
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
Justin Clark-Casey (justincc)
bf9555eaee
minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid
2010-12-18 00:57:09 +00:00
Justin Clark-Casey (justincc)
ef43f98686
Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops)
2010-12-18 00:45:56 +00:00
Melanie
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
Justin Clark-Casey (justincc)
5782f5662b
remove now unused subversion serialization backup config
2010-12-17 23:06:55 +00:00
Justin Clark-Casey (justincc)
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
Justin Clark-Casey (justincc)
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
Justin Clark-Casey (justincc)
3b1c91c24b
remove mono compiler warnings
2010-12-17 22:35:08 +00:00
Justin Clark-Casey (justincc)
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
Justin Clark-Casey (justincc)
19f70b93a0
tidy up the [Groups] section in OpenSim.ini.example
2010-12-17 21:19:57 +00:00
Justin Clark-Casey (justincc)
0745d65344
Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
...
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
Robert Adams
420aeb9b6a
remove debug statements. Pass terrain to physics engine
2010-12-15 15:05:40 -08:00
Diva Canto
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
Diva Canto
74c68474e0
Another attempt at moving heavy computation away from the Update loop. #LoginLag
2010-12-14 18:44:26 -08:00
Diva Canto
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
justincc
eb07dfc900
Fix windows compile break
2010-12-15 01:06:20 +00:00
justincc
b643661938
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-15 00:35:36 +00:00
justincc
d0576f39e0
replace ode.dll with one built without asserts turned on
2010-12-15 00:35:00 +00:00
Justin Clark-Casey (justincc)
6b135ee371
fix mistake in last change of local.include
2010-12-15 00:14:43 +00:00
Diva Canto
9d0339e8f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 16:04:46 -08:00
Diva Canto
a4309578e2
Another stab at #LoginLag. Looking forward to hear the feedback! This makes updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies.
2010-12-14 16:04:28 -08:00