Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ | |||||
| * \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-05-07 | 7 | -40/+88 |
| |\ \ | |||||
| * | | | Fix Mouse+WASD makes Av rise; Fix PREJUMP. | Kitto Flora | 2010-05-07 | 4 | -28/+40 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 14 | -143/+719 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete ↵ | Diva Canto | 2010-05-07 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | fields. | ||||
| * | | | These files are part of the GridUserService write-up. | Diva Canto | 2010-05-07 | 2 | -0/+269 |
| | | | | |||||
| * | | | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 12 | -3156/+3204 |
| | | | | | | | | | | | | | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs. | ||||
| * | | | improve handling of undersize sculpt textures | dahlia | 2010-05-06 | 1 | -4/+11 |
| | | | | |||||
| * | | | corrections for face numbering and uv mapping, mostly for spheres - sync ↵ | dahlia | 2010-05-06 | 1 | -2201/+2284 |
| | | | | | | | | | | | | | | | | with PrimMesher r56 | ||||
| * | | | Sculpt meshing refactoring - improves mesh accuracy and UV mapping | dahlia | 2010-05-06 | 2 | -639/+810 |
| | | | | | | | | | | | | | | | | Sync with PrimMesher r55 | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-07 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Also remove sale and search flags on god owner change. | Melanie | 2010-05-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | Remove land that is being abandoned from search. This is now consistent with | Melanie | 2010-05-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | sale and reclaim. | ||||
| * | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵ | Melanie | 2010-05-06 | 5 | -206/+436 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" Causes an exception within HttpServer, headers have already been sent. This reverts commit 8187fccd258bf0936d3db8663844e07a7b81e9fc. | ||||
* | | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵ | Melanie | 2010-05-06 | 5 | -206/+436 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" Causes an exception within HttpServer, headers have already been sent. This reverts commit 8187fccd258bf0936d3db8663844e07a7b81e9fc. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-06 | 7 | -110/+138 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-06 | 2 | -3/+18 |
| |\ \ \ | |||||
| | * | | | * Fixes Library bugs in grid mode. Partly a missing check and partly a ↵ | Diva Canto | 2010-05-05 | 2 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing configuration. * Made previous Robust config changes consistent in Robust.HG.ini.example | ||||
| * | | | | Ensure the show in search flag is cleared on ownership change. Also, when | Melanie | 2010-05-06 | 2 | -1/+8 |
| |/ / / | | | | | | | | | | | | | | | | | land is reclaimed, reset it's for sale flags so it can't be bought again right away. | ||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-05 | 3 | -106/+112 |
| |\ \ \ | |||||
| | * | | | Added copying of Viewer field to the agent circuit data that is being passed ↵ | Diva Canto | 2010-05-05 | 3 | -106/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on TPs and crossings. (XmlRpcGroups files want to be committed too) |