Commit Graph

15177 Commits (98f0b4c72ad208e9f664d30bb6a84e0b2adf8214)

Author SHA1 Message Date
sacha 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
sacha d7df871f9f reactivating some traces to track a dead thread
seen @ NT and Otaku
2010-12-23 08:11:52 +00:00
Melanie d06456c8b2 Merge branch 'master' into careminster-presence-refactor 2010-12-23 02:57:45 +00: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
Melanie 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
Melanie cf37b3b943 Prevent a null ref when an avatar login doesn't go as planned 2010-12-22 03:25:30 +01: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 e9382c2939 Merge branch 'master' into careminster-presence-refactor 2010-12-21 23:09:12 +00:00
Melanie 303c02133f Merge branch 'master' into careminster-presence-refactor 2010-12-21 23:00:01 +00: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 a70b597840 Merge branch 'master' into careminster-presence-refactor 2010-12-21 22:57:31 +00:00
Melanie 19181c019a Another good catch. Update file name serial. 2010-12-21 22:56:48 +00:00
Melanie da37ddff9f Merge branch 'master' into careminster-presence-refactor 2010-12-21 22:50:35 +00:00
Melanie ec8d1d0131 Added a missed return. Thanks diva! 2010-12-21 22:49:38 +00:00
Melanie 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
Melanie b1180a53dd Merge branch 'master' into careminster-presence-refactor 2010-12-21 20:56:37 +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
Melanie c9aa420c2d Restore CM loking after core extract 2010-12-21 20:48:58 +00:00
Melanie 2f84f2171f Make prim inventories a bit more sane 2010-12-21 20:47:00 +00:00
Mic Bowman a6a136bd90 Shooting in the dark for solutions to the appearance problem 2010-12-20 14:24:52 -08:00
Kitto Flora 5fccbe21d6 Update materials parameters. 2010-12-20 07:04:35 +00: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
Melanie 11eabf0e51 Merge branch 'master' into careminster-presence-refactor 2010-12-20 02:49:31 +00: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
Mike Rieker 7a78de8105 fix 'system.exception: unknown type in list.size: system.uint32' 2010-12-18 23:29:49 +00: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 a82112a47c Merge branch 'master' into careminster-presence-refactor 2010-12-17 22:50:25 +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
Melanie d7622cbedc Fix notecards that end with an embedded object causing an exception 2010-12-16 21:01:38 +01:00
Melanie 835e4dbc2c Add locks on m_killRecord without breaking things like justin did 2010-12-16 20:49:40 +01:00
Melanie aebc011f7b Remove some spam from FreeSwitchModule 2010-12-16 20:12:18 +01:00
Melanie 4719e925b8 Revert the locking changes in LLCLientView 2010-12-16 20:11:26 +01: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
Melanie d457b4c4b1 Merge branch 'master' into careminster-presence-refactor 2010-12-15 22:59:52 +00:00