aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-05-078-41/+89
| |\ \
| * | | Fix Mouse+WASD makes Av rise; Fix PREJUMP.Kitto Flora2010-05-074-28/+40
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0852-724/+1754
|\ \ \ \ | | |_|/ | |/| |
| * | | test commit for pandadahlia2010-05-071-0/+1
| * | | More Git/panda integration Testing..Teravus Ovares (Dan Olivares)2010-05-081-8/+8
| * | | Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete f...Diva Canto2010-05-072-9/+1
| * | | These files are part of the GridUserService write-up.Diva Canto2010-05-077-0/+702
| * | | GridUserService in place. Replaces the contrived concept of storing user's ho...Diva Canto2010-05-0744-3723/+3797
| * | | improve handling of undersize sculpt texturesdahlia2010-05-061-4/+11
| * | | corrections for face numbering and uv mapping, mostly for spheres - sync with...dahlia2010-05-061-2201/+2284
| * | | Sculpt meshing refactoring - improves mesh accuracy and UV mappingdahlia2010-05-062-639/+810
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-071-0/+2
|\ \ \ \ | |/ / /
| * | | Also remove sale and search flags on god owner change.Melanie2010-05-071-0/+1
| * | | Remove land that is being abandoned from search. This is now consistent withMelanie2010-05-071-0/+1
| * | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for...Melanie2010-05-065-206/+436
* | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for...Melanie2010-05-065-206/+436
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0611-117/+156
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-066-10/+36
| |\ \ \
| | * | | * Fixes Library bugs in grid mode. Partly a missing check and partly a missin...Diva Canto2010-05-055-4/+26
| | * | | * Fixes LandDataSerializerTests on Windows by stripping CR from the serializa...Teravus Ovares (Dan Olivares)2010-05-051-6/+10
| * | | | Ensure the show in search flag is cleared on ownership change. Also, whenMelanie2010-05-062-1/+8
| |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-053-106/+112
| |\ \ \
| | * | | Added copying of Viewer field to the agent circuit data that is being passed ...Diva Canto2010-05-053-106/+112
| * | | | Remove the m_Viewer variable and make the property a shortcut to theMelanie Thielker2010-05-052-7/+1
| |/ / /
* | | | Remove the m_Viewer variable and make the property a shortcut to theMelanie Thielker2010-05-062-7/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-058-545/+354
|\ \ \ \ | |/ / /
| * | | Stab a test failMelanie2010-05-051-1/+3
| * | | Plumb Viewer version into ScenePresence for initial login. It's still notMelanie Thielker2010-05-052-0/+2
| * | | Plumb the viewer version string through into AgentCircuitData. Now all thatMelanie Thielker2010-05-055-9/+27
| * | | Add a XMLRPC method to remotely set the login level for the LLLoginService.Melanie Thielker2010-05-055-0/+93
| * | | Removed a test for a "can't happen" case. ParentGroup is never null anymore.Melanie Thielker2010-05-051-9/+1
| * | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groupsMelanie2010-05-055-542/+312