aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-161-1/+1
|\
| * Prevent a crash when the two agent dictionaries get out of syncMelanie2010-05-161-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-164-26/+39
|\ \ | |/
| * Fixes mantis #4691 for real. This time I tested it, and it works.Diva Canto2010-05-162-1/+18
| * Fixes mantis #4691Diva Canto2010-05-163-3/+8
| * Fixes mantis #4622.Diva Canto2010-05-161-23/+14
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-05-166-13/+73
|\ \
| * | 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 conver...Tom Grimshaw2010-05-121-8/+48
| * | Don't convert UUID -> ToString for every friend (Minor optimisation based on ...Tom Grimshaw2010-05-121-1/+2
| * | Spin the AddNewClient process off into a new thread to avoid locking up the L...Tom Grimshaw2010-05-111-1/+2
| * | 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 connectio...Diva Canto2010-05-162-5/+4
| * 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 127.0.0.1...Diva Canto2010-05-152-5/+6
| * | | * Revert last commit for now at Melanie_T's request.Teravus Ovares (Dan Olivares)2010-05-161-1/+2
| | |/ | |/|
| * | 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 wher...Diva Canto2010-05-151-4/+4
| | * 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 eith...Teravus Ovares (Dan Olivares)2010-05-151-1/+115
| |/
| * 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 de...Justin Clark-Casey (justincc)2010-05-151-2/+3
| * Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671Justin Clark-Casey2010-05-141-0/+4
| * 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 making...Diva Canto2010-05-101-1/+1
* | 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 ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-05-1039-212/+297
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-1019-40/+78
| |\ \ | | |/
| | * Return agents when angle is PIMelanie2010-05-101-0/+4
| | * 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 statement...Diva Canto2010-05-092-3/+3
| | | * * Fixed spamming the assets table with map tiles. The tile image ID is now st...Diva Canto2010-05-0917-36/+72
| | * | 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 ass...Melanie2010-05-0911-6/+60
| * | 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
| | * * Added missing loggout notification to home grid upon agents logging out in ...Diva Canto2010-05-083-0/+15
| | * 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 a...Tom Grimshaw2010-05-101-6/+39
|/ /
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-084-28/+40
|\ \