aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Fix a nullref issue in SitAltitudeCallbackTom Grimshaw2010-05-191-6/+9
* Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-05-193-3/+8
|\
| * Allow remote admin to be used on a different port from the main region portMelanie Thielker2010-05-182-2/+7
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-05-181-1/+1
| |\
| | * Change an exception reporting to include the stack trace. "e.Message" justMelanie2010-05-181-1/+1
* | | Fix a null reference issue in cmGetAvatarList()Tom Grimshaw2010-05-191-1/+1
|/ /
* | Don't send kill packets to child agents as we close themTom Grimshaw2010-05-181-2/+2
* | Fix to the scenario where we send an agent to a neighbouring sim (via telepor...Tom Grimshaw2010-05-188-7/+103
* | Missed a nullref in the previous commitTom Grimshaw2010-05-181-0/+2
* | Fix for hanging on "Connecting to region".. caused by packets being processed...Tom Grimshaw2010-05-1810-54/+114
* | While examining our 10,10,10 issue I discovered that several threads were loc...Tom Grimshaw2010-05-181-8/+5
* | Prevent an "index out of range" error on loginMelanie Thielker2010-05-181-2/+5
* | Following on from the last commit, the stop/disconnect packet should NOT be s...Tom Grimshaw2010-05-171-1/+1
* | When killing a zombie session, don't send the stop packet since it often has ...Tom Grimshaw2010-05-1710-5/+55
* | 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