aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2010-05-166-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 problemsTom Grimshaw2010-05-131-0/+8
| |
| * Kill some locks that have crept into SOGTom Grimshaw2010-05-121-2/+12
| |
| * Optimise the heavily used GetScenePresences; eliminate the array->list ↵Tom Grimshaw2010-05-121-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 Grimshaw2010-05-121-1/+2
| | | | | | | | profiler feedback)
| * Spin the AddNewClient process off into a new thread to avoid locking up the ↵Tom Grimshaw2010-05-111-1/+2
| | | | | | | | LLUDPServer (and therefore the entire scene)
| * Fix another ReaderWriterLockSlim issueTom Grimshaw2010-05-101-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-1618-111/+284
|\ \ | |/ |/|
| * * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite ↵Diva Canto2010-05-162-5/+4
| | | | | | | | | | | | connection strings. * Added a comment in LLLoginService.cs, for future reference
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-05-162-5/+6
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-05-151-1/+115
| | |\
| | * | This combination is working. It all points to not being able to use ↵Diva Canto2010-05-152-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-161-1/+2
| | |/ | |/| | | | | | | * Additional ways of configuring opensim break with this
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-05-1511-41/+144
| |\ \ | | |/
| | * Almost, but not quite. Commenting verification again, until I understand ↵Diva Canto2010-05-151-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 Canto2010-05-1511-45/+148
| | |
| * | * Add User Friendly Configuration File Exists check. If OpenSim.ini and ↵Teravus Ovares (Dan Olivares)2010-05-151-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 MessageServerInfoJustin Clark-Casey (justincc)2010-05-151-48/+0
| |
| * Make "nant distbin" remove BUILDING.txtJustin Clark-Casey2010-05-151-0/+1
| |
| * Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵Justin Clark-Casey (justincc)2010-05-151-2/+3
| | | | | | | | dereference inside the exception catch
| * Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671Justin Clark-Casey2010-05-141-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 Canto2010-05-131-8/+8
| |
| * Removed the unreferenced MaxPrimsPerFrame from OpenSim.ini.exampleunknown2010-05-121-3/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-1/+1
|\ \ | |/
| * Fixed a typo in the Friends packaging (Pricipal -> Principal) that was ↵Diva Canto2010-05-101-1/+1
| | | | | | | | making offline friendship offers fail in grids.
* | Fix overlooked readLock which was left openTom Grimshaw2010-05-101-1/+2
| |
* | Correct an odd merge anomalyTom Grimshaw2010-05-101-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-05-1039-212/+297
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-1019-40/+78
| |\ \ | | |/
| | * Return agents when angle is PIMelanie2010-05-101-0/+4
| | | | | | | | | | | | Fixes Mantis #4703
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-1017-38/+74
| | |\
| | | * OK, this really fixes it, I promise.Diva Canto2010-05-091-2/+2
| | | |
| | | * Yey for unit tests. The previous commit had a couple of bugs on SQL ↵Diva Canto2010-05-092-3/+3
| | | | | | | | | | | | | | | | statements. Fixed here.
| | | * * Fixed spamming the assets table with map tiles. The tile image ID is now ↵Diva Canto2010-05-0917-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 crossingMelanie2010-05-101-1/+4
| | |/
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0911-20/+75
| |\ \ | | |/
| | * Add Delete handler to SQLite (NG)Melanie2010-05-091-15/+16
| | |
| | * Implement the "delete" path for assets. Adds a new option to allow remote ↵Melanie2010-05-0911-6/+60
| | | | | | | | | | | | asset deletion in robust handler.
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0916-157/+149
| |\ \ | | |/
| | * Add a field asset_flags and a corresponding enum to the asset database. ThisMelanie2010-05-094-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 Canto2010-05-083-0/+15
| | | | | | | | | | | | | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini
| | * More cleaning on presence. Friends online/offline works again.Diva Canto2010-05-089-154/+101
| | |
* | | Greatly improve login time for users with large friends lists by requesting ↵Tom Grimshaw2010-05-101-6/+39
|/ / | | | | | | all unknown UUID's in one go rather than individually
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-084-28/+40
|\ \
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-05-078-41/+89
| |\ \
| * | | Fix Mouse+WASD makes Av rise; Fix PREJUMP.Kitto Flora2010-05-074-28/+40
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0852-724/+1754
|\ \ \ \ | | |_|/ | |/| |
| * | | test commit for pandadahlia2010-05-071-0/+1
| | | |
| * | | More Git/panda integration Testing..Teravus Ovares (Dan Olivares)2010-05-081-8/+8
| | | |
| * | | Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete ↵Diva Canto2010-05-072-9/+1
| | | | | | | | | | | | | | | | fields.
generated by cgit v1.1 at 2024-11-15 13:06:54 +0000