Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-21 | 2 | -22/+54 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-21 | 5 | -443/+542 | |
| |\ \ \ \ | ||||||
| | * | | | | back port groups changes | unknown | 2010-05-05 | 2 | -1329/+73 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | | | | back port groups changes | unknown | 2010-05-05 | 5 | -443/+1798 | |
| | | | | | | ||||||
| | * | | | | 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 | 4 | -3/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | ||||||
* | | | | | | 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 | 5 | -6/+59 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -54/+97 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | 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 | 5 | -4/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | the effect of killing a newly connected client. | |||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 1 | -23/+14 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Fixes mantis #4622. | Diva Canto | 2010-05-16 | 1 | -23/+14 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-05-16 | 5 | -13/+65 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * | | | | | | 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 | 7 | -28/+201 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | ||||||
| * | | | | | * 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 | 4 | -25/+78 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 4 | -25/+78 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | * 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. | |||||
| * | | | | 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! | |||||
* | | | | 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 | 12 | -123/+129 | |
|\ \ \ \ | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 8 | -24/+29 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | 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 | 6 | -22/+25 | |
| | |\ \ \ | ||||||
| | | * | | | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵ | Diva Canto | 2010-05-09 | 6 | -22/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -99/+100 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | * Added missing loggout notification to home grid upon agents logging out in ↵ | Diva Canto | 2010-05-08 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini | |||||
| | * | | | More cleaning on presence. Friends online/offline works again. | Diva Canto | 2010-05-08 | 4 | -99/+92 | |
| | | | | | ||||||
* | | | | | 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 | |
|\ \ \ \ | | |/ / | |/| | |