Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-20 | 1 | -6/+28 |
|\ | |||||
| * | Allow item links to be deleted even when other deletes and purges are disabled. | Justin Clark-Casey (justincc) | 2011-05-19 | 1 | -6/+28 |
| | | | | | | | | | | | | | | If these links are not deleted, then they will build up in the player's inventory until they can no longer log in. Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being accidentally moved. When a link is deleted, the target of the link is never touched. This is a general solution that accounts for the use of links anywhere in the user's inventory. | ||||
| * | Accidentally committed too early | Justin Clark-Casey (justincc) | 2011-05-18 | 1 | -24/+6 |
| | | | | | | | | | | | | Revert "Allow item links to be deleted even when other deletes and purges are disabled." This reverts commit 491279f99afc65860d44765ee7829c7dd5e4e38e. | ||||
| * | Allow item links to be deleted even when other deletes and purges are disabled. | Justin Clark-Casey (justincc) | 2011-05-17 | 1 | -6/+24 |
| | | | | | | | | | | | | | | If these links are not deleted, then they will build up in the player's inventory until they can no longer log in. Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being accidentally moved. When a link is deleted, the target of the link is never touched. This is a general solution that accounts for the use of links anywhere in the user's inventory. | ||||
| * | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -1/+6 |
| | | |||||
* | | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -5/+51 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-05-08 | 1 | -5/+51 |
| |\ | |||||
| | * | minor: slightly shorten "show digest" printing code | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -5/+5 |
| | | | |||||
| | * | on asset "show digest" command, print out the asset type name (e.g. texture) ↵ | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | as well as its number | ||||
| | * | Say which filename an asset has been dumped to on a successful dump | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -2/+6 |
| | | | |||||
| | * | remove the NDesk.Options using since didn't end up needing it | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -1/+0 |
| | | | |||||
| | * | Add "dump asset" command to the asset service for debugging purposes. | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -0/+43 |
| | | | | | | | | | | | | This command dumps the asset with the given id to a file with the same name. | ||||
| * | | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -5/+14 |
| |/ | |||||
* | | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -5/+14 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 2 | -2/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'master' into caps | Diva Canto | 2011-05-02 | 2 | -8/+8 |
| |\ | |||||
| * \ | Merge branch 'master' into caps | Diva Canto | 2011-05-01 | 1 | -9/+12 |
| |\ \ | |||||
| * | | | Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll | Diva Canto | 2011-04-30 | 2 | -2/+0 |
| | | | | |||||
* | | | | Attempt to make teleports more reliable. This may break redirection on login | Melanie | 2011-05-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-03 | 2 | -17/+20 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien ↵ | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | avatar takes 6secs to transfer between sims on the same machine... | ||||
| * | | | Oops, forgot this one. | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Turns out that it's a bad idea to let Agent position updates linger for a ↵ | Diva Canto | 2011-05-02 | 1 | -7/+7 |
| | |/ | |/| | | | | | | | long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before. | ||||
| * | | Fixed confusing OSDMap that comes as the response of QueryAccess in the case ↵ | Diva Canto | 2011-05-01 | 1 | -9/+12 |
| |/ | | | | | | | it fails. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 4 | -13/+87 |
|\ \ | |/ | |||||
| * | Minor improvement in version checking (Simulation service) | Diva Canto | 2011-04-29 | 1 | -1/+1 |
| | | |||||
| * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵ | Diva Canto | 2011-04-28 | 2 | -8/+13 |
| | | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. | ||||
| * | Thank you Snoopy for a patch that adds some filtering to client versions ↵ | Diva Canto | 2011-04-27 | 2 | -5/+74 |
| | | | | | | | | allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 2 | -7/+5 |
|\ \ | |/ | |||||
| * | Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails. | Diva Canto | 2011-04-25 | 1 | -6/+4 |
| | | |||||
| * | Commented verbose debug message. | Diva Canto | 2011-04-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -5/+3 |
|\ \ | |/ | |||||
| * | Adjust freeswitch logging to be somewhat less noisy. However, there is ↵ | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -5/+3 |
| | | | | | | | | still quite a large amount of logging present for debug purposes. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 2 | -14/+17 |
|\ \ | |/ | |||||
| * | Clean up freeswitch config to what is currently required. Add explanation ↵ | Justin Clark-Casey (justincc) | 2011-04-19 | 2 | -14/+17 |
| | | | | | | | | to config parameters. Clean up some log messages. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 16 | -14/+12 |
|\ \ | |/ | |||||
| * | Make all the objects in a coalescence reappears after being loaded from an ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -1/+14 |
| | | | | | | | | | | | | | | IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups. | ||||
| * | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵ | Diva Canto | 2011-04-12 | 14 | -14/+1 |
| | | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: add a bit more method doc to IInventoryService.GetItem() | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -1/+36 |
|\ \ | |/ | |||||
| * | Improvement over 2 commits ago: make the hyperlink check understand port 80. | Diva Canto | 2011-03-28 | 1 | -4/+29 |
| | | |||||
| * | Fix mantis #5413. WARNING: new config variable in section [GridService] of ↵ | Diva Canto | 2011-03-28 | 1 | -0/+10 |
| | | | | | | | | the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples. | ||||
* | | Make the login service's call to the sim time out quicker so we have a | Melanie | 2011-03-31 | 1 | -1/+1 |
| | | | | | | | | chance to try fallback before the client quits | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 3 | -4/+139 |
|\ \ | |/ | |||||
| * | Rename some member fields to standard m_ OpenSim code convention | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -8/+8 |
| | | |||||
| * | add header file | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+28 |
| | |