| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | Prevent a crash when the two agent dictionaries get out of sync | Melanie | 2010-05-16 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 4 | -26/+39 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | Fixes mantis #4691 for real. This time I tested it, and it works. | Diva Canto | 2010-05-16 | 2 | -1/+18 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fixes mantis #4691 | Diva Canto | 2010-05-16 | 3 | -3/+8 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fixes mantis #4622. | Diva Canto | 2010-05-16 | 1 | -23/+14 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-05-16 | 6 | -13/+73 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * | | | | | | | | Add some debug output to GetAgent to try and track down our presence problems | Tom Grimshaw | 2010-05-13 | 1 | -0/+8 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Kill some locks that have crept into SOG | Tom Grimshaw | 2010-05-12 | 1 | -2/+12 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Optimise the heavily used GetScenePresences; eliminate the array->list ↵ | Tom Grimshaw | 2010-05-12 | 1 | -8/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conversion on every call and transition from hard locks to ReaderWriter locks. | |||||
| | * | | | | | | | | Don't convert UUID -> ToString for every friend (Minor optimisation based on ↵ | Tom Grimshaw | 2010-05-12 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profiler feedback) | |||||
| | * | | | | | | | | Spin the AddNewClient process off into a new thread to avoid locking up the ↵ | Tom Grimshaw | 2010-05-11 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLUDPServer (and therefore the entire scene) | |||||
| | * | | | | | | | | Fix another ReaderWriterLockSlim issue | Tom Grimshaw | 2010-05-10 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 18 | -111/+284 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | ||||||
| | * | | | | | | | * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite ↵ | Diva Canto | 2010-05-16 | 2 | -5/+4 | |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection strings. * Added a comment in LLLoginService.cs, for future reference | |||||
| | * | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-05-16 | 2 | -5/+6 | |
| | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-05-15 | 1 | -1/+115 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | This combination is working. It all points to not being able to use ↵ | Diva Canto | 2010-05-15 | 2 | -5/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing. | |||||
| | * | | | | | | | | * Revert last commit for now at Melanie_T's request. | Teravus Ovares (Dan Olivares) | 2010-05-16 | 1 | -1/+2 | |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | * Additional ways of configuring opensim break with this | |||||
| | * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-05-15 | 11 | -41/+144 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | | * | | | | | | Almost, but not quite. Commenting verification again, until I understand ↵ | Diva Canto | 2010-05-15 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets. | |||||
| | | * | | | | | | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 11 | -45/+148 | |
| | | | |_|_|_|/ | | |/| | | | | ||||||
| | * | | | | | | * Add User Friendly Configuration File Exists check. If OpenSim.ini and ↵ | Teravus Ovares (Dan Olivares) | 2010-05-15 | 1 | -1/+115 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files. | |||||
| | * | | | | | delete now unused MessageServerInfo | Justin Clark-Casey (justincc) | 2010-05-15 | 1 | -48/+0 | |
| | | | | | | | ||||||
| | * | | | | | Make "nant distbin" remove BUILDING.txt | Justin Clark-Casey | 2010-05-15 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵ | Justin Clark-Casey (justincc) | 2010-05-15 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | dereference inside the exception catch | |||||
| | * | | | | | Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 | Justin Clark-Casey | 2010-05-14 | 1 | -0/+4 | |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object Thanks crystalsgalicia! | |||||
| | * | | | | Made fields consistently protected. | Diva Canto | 2010-05-13 | 1 | -8/+8 | |
| | | |_|/ | |/| | | ||||||
| | * | | | Removed the unreferenced MaxPrimsPerFrame from OpenSim.ini.example | unknown | 2010-05-12 | 1 | -3/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Fixed a typo in the Friends packaging (Pricipal -> Principal) that was ↵ | Diva Canto | 2010-05-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | making offline friendship offers fail in grids. | |||||
| * | | | | Fix overlooked readLock which was left open | Tom Grimshaw | 2010-05-10 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Correct an odd merge anomaly | Tom Grimshaw | 2010-05-10 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-10 | 39 | -212/+297 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 19 | -40/+78 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Return agents when angle is PI | Melanie | 2010-05-10 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | Fixes Mantis #4703 | |||||
| | | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-10 | 17 | -38/+74 | |
| | | |\ \ \ | ||||||
| | | | * | | | OK, this really fixes it, I promise. | Diva Canto | 2010-05-09 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | | | * | | | Yey for unit tests. The previous commit had a couple of bugs on SQL ↵ | Diva Canto | 2010-05-09 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | statements. Fixed here. | |||||
| | | | * | | | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵ | Diva Canto | 2010-05-09 | 17 | -36/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found. | |||||
| | | * | | | | Fix a null ref on region crossing | Melanie | 2010-05-10 | 1 | -1/+4 | |
| | | |/ / / | ||||||
| | * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-09 | 11 | -20/+75 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Add Delete handler to SQLite (NG) | Melanie | 2010-05-09 | 1 | -15/+16 | |
| | | | | | | ||||||
| | | * | | | Implement the "delete" path for assets. Adds a new option to allow remote ↵ | Melanie | 2010-05-09 | 11 | -6/+60 | |
| | | | | | | | | | | | | | | | | | | | | | asset deletion in robust handler. | |||||
| | * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-09 | 16 | -157/+149 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Add a field asset_flags and a corresponding enum to the asset database. This | Melanie | 2010-05-09 | 4 | -3/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS WITH LATER ONES. It may also eat your babies, yada, yada, yada. The usual cautions for migrations to the assets table apply. Coding: Can not guarantee nut free. | |||||
| | | * | | | * Added missing loggout notification to home grid upon agents logging out in ↵ | Diva Canto | 2010-05-08 | 3 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini | |||||
| | | * | | | More cleaning on presence. Friends online/offline works again. | Diva Canto | 2010-05-08 | 9 | -154/+101 | |
| | | | | | | ||||||
| * | | | | | Greatly improve login time for users with large friends lists by requesting ↵ | Tom Grimshaw | 2010-05-10 | 1 | -6/+39 | |
| |/ / / / | | | | | | | | | | | | | all unknown UUID's in one go rather than individually | |||||
| * | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-08 | 4 | -28/+40 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |