Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor scene presence list for lockless iteration. Lock contention will ↵ | Melanie | 2010-05-21 | 1 | -82/+49 |
| | | | | now only be for simultaneous add/removes of scene presences from the scene. | ||||
* | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-21 | 3 | -23/+54 |
|\ | |||||
| * | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-21 | 7 | -446/+554 |
| |\ | |||||
| | * | back port groups changes | unknown | 2010-05-05 | 3 | -1334/+73 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | back port groups changes | unknown | 2010-05-05 | 7 | -446/+1815 |
| | | | |||||
| | * | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵ | Melanie | 2010-05-05 | 4 | -1570/+320 |
| | | | | | | | | | | | | | | | | | | | | | | | | for groups" The patch was for 0.7 This reverts commit 608bb0dfefbbc97aded6d1357dd9d350053411fb. | ||||
| | * | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups | Melanie | 2010-05-05 | 4 | -320/+1570 |
| | | | | | | | | | | | | | | | | | | Mantis #4646 Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| | | | |||||
| | * | Fix some symbol errors | Melanie | 2010-04-30 | 1 | -2/+2 |
| | | | |||||
| * | | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | | | | | some older content | ||||
| * | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -50/+53 |
| | | | |||||
| * | | Fix a null reference issue in cmGetAvatarList() | Tom Grimshaw | 2010-05-19 | 1 | -1/+1 |
| | | | |||||
| * | | Provide interface to prevent the client close function from sending the stop ↵ | Tom Grimshaw | 2010-05-17 | 9 | -4/+54 |
| | | | | | | | | | | | | packet | ||||
* | | | Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo ↵ | Tom Grimshaw | 2010-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | with kitto | ||||
* | | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -6/+9 |
| | | | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-19 | 3 | -3/+8 |
|\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Allow remote admin to be used on a different port from the main region port | Melanie Thielker | 2010-05-18 | 2 | -2/+7 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-18 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Change an exception reporting to include the stack trace. "e.Message" just | Melanie | 2010-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | _won't_ do. Might look more elegant, but it's too little information. | ||||
* | | | | | Fix a null reference issue in cmGetAvatarList() | Tom Grimshaw | 2010-05-19 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Don't send kill packets to child agents as we close them | Tom Grimshaw | 2010-05-18 | 1 | -2/+2 |
| | | | | |||||
* | | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 8 | -7/+103 |
| | | | | | | | | | | | | | | | | teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. | ||||
* | | | | Missed a nullref in the previous commit | Tom Grimshaw | 2010-05-18 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix for hanging on "Connecting to region".. caused by packets being ↵ | Tom Grimshaw | 2010-05-18 | 10 | -54/+114 |
| | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready. | ||||
* | | | | While examining our 10,10,10 issue I discovered that several threads were ↵ | Tom Grimshaw | 2010-05-18 | 1 | -8/+5 |
| | | | | | | | | | | | | | | | | locked with each other in an unusual place; I've moved the piece of code inside a lock[] context and so far it's looking promising. | ||||
* | | | | Prevent an "index out of range" error on login | Melanie Thielker | 2010-05-18 | 1 | -2/+5 |
| | | | | |||||
* | | | | Following on from the last commit, the stop/disconnect packet should NOT be ↵ | Tom Grimshaw | 2010-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | sent when the user logs out. This eliminates the annoying "crash on log out" bug, and allows the client to commit important information at the last moment (attachment data!) | ||||
* | | | | When killing a zombie session, don't send the stop packet since it often has ↵ | Tom Grimshaw | 2010-05-17 | 10 | -5/+55 |
| | | | | | | | | | | | | | | | | the effect of killing a newly connected client. | ||||
* | | | | 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 |
| | | | | |