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
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
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
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
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
Mic Bowman
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -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
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
Justin Clark-Casey (justincc)
5f8c660489
add new optionalmodules test dll to panda test run (and nant test command)
2010-12-14 23:58:39 +00:00
Justin Clark-Casey (justincc)
3643be1c97
Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its contents
2010-12-14 23:46:02 +00:00
Justin Clark-Casey (justincc)
92727ad596
minor: disable debug logging for previous test
2010-12-14 23:41:36 +00:00
Justin Clark-Casey (justincc)
8a5f9b91de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 23:39:21 +00:00
Justin Clark-Casey (justincc)
81bccd6d13
Start implementing a test for 'share with group' object functionality. Not yet complete.
...
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
Justin Clark-Casey (justincc)
42c9c30e4c
Add mock group services connector and use this in tests
2010-12-14 22:57:36 +00:00
Justin Clark-Casey (justincc)
c620e4c822
add infrastructure for groups module tests
2010-12-14 22:25:01 +00:00
Diva Canto
ff8ff773e7
Relax a highly constraining lock on m_entityUpdates that may be preventing reprioritizations from actually happening. #LoginLag
2010-12-14 12:58:32 -08:00
Diva Canto
10ae5454cb
Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time.
2010-12-14 12:16:51 -08:00
Diva Canto
4357288a94
More on mantis #5270
2010-12-14 11:24:23 -08:00
Diva Canto
55e04e6c68
Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims.
2010-12-14 08:11:49 -08:00
Melanie
e47cc10674
Null checking ParentGroup is not needed. It can't be null.
2010-12-14 12:07:35 +00:00