| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-25 | 3 | -83/+25 | |
| |\ \ | |/ | ||||||
| | * | This fixes mantis #5198 and related. Physics is not my expertise, so I'm not ↵ | Diva Canto | 2010-12-24 | 1 | -0/+5 | |
| | | | | | | | | | 100% sure of what all the consequences of this change are. Pushing up, so others can take a look. | |||||
| | * | One more pass at object inventory. This time, fix SceneObjectPartInventory ↵ | Diva Canto | 2010-12-24 | 2 | -148/+82 | |
| | | | | | | | | | so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's. | |||||
| * | | Update child prim group positions in moving vehicles | Melanie | 2010-12-24 | 1 | -2/+5 | |
| | | | ||||||
| * | | Change the mute list parts of the client interface so that all data is provided | Melanie | 2010-12-24 | 2 | -5/+4 | |
| | | | | | | | | | to the module | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-24 | 1 | -35/+49 | |
| |\ \ | |/ | ||||||
| | * | Hopefully this fixes all prim inventory issues. No more abort, no more ↵ | Diva Canto | 2010-12-23 | 1 | -35/+49 | |
| | | | | | | | | | | | | | keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added. This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 7 | -952/+26 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-12-23 | 9 | -961/+55 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-23 | 4 | -13/+39 | |
| | | |\ | ||||||
| | | * | | Removed unused code -- this was the previous version of UDP texture sending, ↵ | Diva Canto | 2010-12-23 | 6 | -948/+16 | |
| | | | | | | | | | | | | | | | | | which now lives entirely in LindenUDP space. | |||||
| | * | | | * Cleanup from a commit a while ago. | Teravus Ovares (Dan Olivares) | 2010-12-23 | 1 | -4/+10 | |
| | |/ / | ||||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 4 | -11/+36 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Put back a commented section of code. With some viewers, object inventory | Melanie | 2010-12-23 | 1 | -6/+5 | |
| | | | | | | | | | | | | | transfers just don't start without it. Observed my Nebadon and yours truly. | |||||
| | * | | * Re-Adding Scene TimeDilation to Object Update Packets. | Teravus Ovares (Dan Olivares) | 2010-12-23 | 3 | -7/+34 | |
| | |/ | | | | | | | | | | | * 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. | |||||
| * | | Revert "reactivating some traces to track a dead thread" | Melanie | 2010-12-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | This reverts commit d7df871f9f3e0e9273980a29f2bbdfd6597963ee. Useless spam nit suitable for debugging anything that is currently brokwn | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | sacha | 2010-12-23 | 19 | -186/+244 | |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 2 | -18/+43 | |
| | |\ \ | | |/ | ||||||
| | | * | Added a counter to NewFiles in Xfers to account for simultaneous object ↵ | Diva Canto | 2010-12-22 | 1 | -16/+42 | |
| | | | | | | | | | | | | | inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer. | |||||
| | | * | Fix a broken format on an error message. Also replace yet another e.Message | Melanie | 2010-12-22 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere | |||||
| | * | | Fix up some locking issues in task inventory. Don't use any prior versions ↵ | Melanie | 2010-12-22 | 1 | -0/+2 | |
| | | | | | | | | | | | | | in production! | |||||
| | * | | Prevent a null ref when an avatar login doesn't go as planned | Melanie | 2010-12-22 | 3 | -3/+4 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 9 | -4/+106 | |
| | |\ \ | | |/ | ||||||
| | | * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 9 | -4/+106 | |
| | | | | | | | | | | | | | | | | | | | * 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. | |||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -1/+1 | |
| | |\ \ | | |/ | ||||||
| | | * | What is the point of using different types to express the same damn thing? | Melanie | 2010-12-21 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 | |
| | |\ \ | | |/ | ||||||
| | | * | Another good catch. Update file name serial. | Melanie | 2010-12-21 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 | |
| | |\ \ | | |/ | ||||||
| | | * | Added a missed return. Thanks diva! | Melanie | 2010-12-21 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-21 | 1 | -92/+108 | |
| | |\ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 2 | -9/+7 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Fix up merge artifacts | Melanie | 2010-12-21 | 1 | -10/+1 | |
| | | | | | ||||||
| | | * | | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 4 | -108/+39 | |
| | | | | | ||||||
| | | * | | Shooting in the dark for solutions to the appearance problem | Mic Bowman | 2010-12-20 | 2 | -8/+8 | |
| | | | | | ||||||
| | * | | | Restore CM loking after core extract | Melanie | 2010-12-21 | 1 | -65/+64 | |
| | | | | | ||||||
| | * | | | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 4 | -110/+39 | |
| | | | | | ||||||
| * | | | | reactivating some traces to track a dead thread | sacha | 2010-12-23 | 1 | -2/+2 | |
| | |_|/ |/| | | | | | | | | seen @ NT and Otaku | |||||
| * | | | Update materials parameters. | Kitto Flora | 2010-12-20 | 1 | -92/+108 | |
| |/ / | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 6 | -25/+16 | |
| |\ \ | |/ | ||||||
| | * | Put the coarse location updates back to 50 frames, otherwise the dots on the ↵ | Diva Canto | 2010-12-19 | 2 | -3/+3 | |
| | | | | | | | | | mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9. | |||||
| | * | More changes to the long help text for console command link-region. | Marck | 2010-12-20 | 1 | -3/+3 | |
| | | | ||||||
| | * | Fix osTeleportAgent and osTeleportOwner for the case that GridService is ↵ | Marck | 2010-12-20 | 1 | -11/+5 | |
| | | | | | | | | | used with a storage provider other than NullRegionData. | |||||
| | * | Make long help text for new link-region command syntax more explicit. | Marck | 2010-12-19 | 1 | -1/+1 | |
| | | | ||||||
| | * | uncomment "load iar" help lines which added the --merge option | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -5/+3 | |
| | | | ||||||
| | * | minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -3/+3 | |
| | | | | | | | | | console command isn't valid | |||||
| | * | Raise maximum iar version that master can load to 1.x, so that it can load ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -1/+1 | |
| | | | | | | | | | its own iars (oops) | |||||
| * | | fix 'system.exception: unknown type in list.size: system.uint32' | Mike Rieker | 2010-12-18 | 1 | -0/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-17 | 8 | -483/+25 | |
| |\ \ | |/ | ||||||
| | * | Fix notecards that end with an embedded object causing an exception | Melanie | 2010-12-17 | 1 | -2/+2 | |
| | | | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |