d829580e5e
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-12-23 13:17:55 -05:00
c108968020
* Cleanup from a commit a while ago.
2010-12-23 13:17:33 -05:00
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
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
70bb542727
Merge branch 'master' into careminster-presence-refactor
2010-12-23 17:20:45 +00:00
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +00:00
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
efa8bd8eb3
Revert "reactivating some traces to track a dead thread"
...
This reverts commit d7df871f9f
2010-12-23 11:15:43 +00:00
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
98f0b4c72a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-23 08:14:43 +00:00
d7df871f9f
reactivating some traces to track a dead thread
...
seen @ NT and Otaku
2010-12-23 08:11:52 +00:00
d06456c8b2
Merge branch 'master' into careminster-presence-refactor
2010-12-23 02:57:45 +00:00
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
f29675bf87
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-22 17:35:12 +00:00
2d8f448322
Fixed wrong argument cardinality in debug message.
2010-12-22 10:42:29 -08:00
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
32cc569b00
Fix up some locking issues in task inventory. Don't use any prior versions in production!
2010-12-22 13:45:21 +01:00
cf37b3b943
Prevent a null ref when an avatar login doesn't go as planned
2010-12-22 03:25:30 +01:00
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
e9382c2939
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:09:12 +00:00
303c02133f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:00:01 +00:00
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
a70b597840
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:57:31 +00:00
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
da37ddff9f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:50:35 +00:00
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
4093e22833
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-21 20:57:52 +00:00
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
c9aa420c2d
Restore CM loking after core extract
2010-12-21 20:48:58 +00:00
2f84f2171f
Make prim inventories a bit more sane
2010-12-21 20:47:00 +00:00
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
5fccbe21d6
Update materials parameters.
2010-12-20 07:04:35 +00:00
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
11eabf0e51
Merge branch 'master' into careminster-presence-refactor
2010-12-20 02:49:31 +00:00
711283d3ca
More changes to the long help text for console command link-region.
2010-12-20 02:50:19 +01:00
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
2a40c8511a
Make long help text for new link-region command syntax more explicit.
2010-12-19 22:59:32 +01:00
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
d576d7c0a6
Replaced HttpServer_OpenSim.dll with a version that locks certain ops in HttpForm -- mantis #5128 .
2010-12-18 17:36:37 -08:00
7a78de8105
fix 'system.exception: unknown type in list.size: system.uint32'
2010-12-18 23:29:49 +00:00
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
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
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
a82112a47c
Merge branch 'master' into careminster-presence-refactor
2010-12-17 22:50:25 +00:00
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
5782f5662b
remove now unused subversion serialization backup config
2010-12-17 23:06:55 +00:00
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
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
Teravus Ovares (Dan Olivares)