aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-12-0717-48/+305
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-12-061-3/+0
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-12-0618-60/+314
| | |\
| | * | Fixed misleading commentDiva Canto2013-12-061-3/+0
| * | | apparently mono DeflateStream has no CopyTo method =(dahlia2013-12-061-1/+5
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-12-0618-54/+337
| |\ \
| | * | Add support for user preferences (im via email)BlueWall2013-12-0614-36/+297
| * | | use System.IO.Compression.DeflateStream for mesh decompression in an attempt ...dahlia2013-12-062-10/+5
* | | | Merge branch 'master' into careminsterMelanie2013-12-0713-7904/+8421
|\ \ \ \ | | |/ / | |/| |
| * | | Adding profile partners fix to SQLite and PgSQL driversBlueWall2013-12-052-4/+0
| * | | Stop writing partner id to record when updating profile data. This should be ...BlueWall2013-12-051-2/+0
| * | | Reversing back to the row["ColumnName"] case field name. http://opensimulator...Fernando Oliveira2013-12-061-1/+1
| * | | minor: Use enums for setting inv/asset types on data upload rather than magic...Justin Clark-Casey (justincc)2013-12-061-7/+7
| * | | Properly set InventoryType.Snapshot when a snapshot is uploadedJustin Clark-Casey (justincc)2013-12-061-0/+4
| | |/ | |/|
| * | Fix regression where mouse look flight direction no longer worked by zeroing ...Justin Clark-Casey (justincc)2013-12-052-14/+26
| * | Ignore X and Y body rotations when sent by mouse look.Justin Clark-Casey (justincc)2013-12-031-3/+15
| |/
| * Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced fo...Justin Clark-Casey (justincc)2013-11-301-1/+1
| * Remove unused SP.Updated flag, which appears unused for many years and was on...Justin Clark-Casey (justincc)2013-11-301-10/+0
| * Implement most effects of AGENT_CONTROL_STOPJustin Clark-Casey (justincc)2013-11-302-44/+104
| * Remove nudgehack from SP.HandleAgentUpdate by making MovementFlag a uint rath...Justin Clark-Casey (justincc)2013-11-301-19/+6
| * Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3...Justin Clark-Casey (justincc)2013-11-291-5/+2
| * Remove unused sp.ParentPosition, which has not been used for some timeJustin Clark-Casey (justincc)2013-11-292-21/+2
| * Comment out debug sit message accidently left activeJustin Clark-Casey (justincc)2013-11-291-3/+3
| * Merge branch 'link-sitting'Justin Clark-Casey (justincc)2013-11-292-16/+111
| |\
| | * Fix regression where sitting on ground stopped working.Justin Clark-Casey (justincc)2013-11-291-8/+11
| | * Restore SP.AbsolutePosition to properly return actual absolute position when ...Justin Clark-Casey (justincc)2013-11-291-1/+1
| | * Fix stand positions rather than having the stand jump to the root prim.Justin Clark-Casey (justincc)2013-11-272-7/+59
| | * Only translate linked prim specified offset pos by the link prim rotation, no...Justin Clark-Casey (justincc)2013-11-261-13/+15
| | * fix position changes when sitting on a prim with position and/or orientation ...Justin Clark-Casey (justincc)2013-11-261-3/+28
| * | Add parameter checking for land_collision, land_collision_start and land_coll...Justin Clark-Casey (justincc)2013-11-292-7784/+8165
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-283-4/+50
| |\ \
| | * | Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages isMic Bowman2013-11-271-2/+4
| | * | "rotate scene" command now uses Constants.RegionSize / 2 to pick the center o...dahlia2013-11-261-4/+15
| | * | add a "rotate scene" console command. Seems to work for prims/sculpts/mesh bu...dahlia2013-11-261-0/+33
| | * | Corrected case to get columns from Regions table from PostgreSQL http://opens...Fernando Oliveira2013-11-251-2/+2
| * | | minor: Change ProfileServiceURL reference in OpenSim.ini.example to be consis...Justin Clark-Casey (justincc)2013-11-281-1/+1
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-11-2376-9536/+10619
|\ \ \ | |/ /
| * | Revert "Fix issue where sitting on non-root linked prims would send camera to...Justin Clark-Casey (justincc)2013-11-232-14/+3
| * | Revert "Add line accidentally left out of recent non-root prim sit fix"Justin Clark-Casey (justincc)2013-11-231-2/+0
| * | Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is...Justin Clark-Casey (justincc)2013-11-231-2/+5
| * | Revert "Fix non-root prim sit positions for prims where a sit target has been...Justin Clark-Casey (justincc)2013-11-231-1/+1
| * | Revert "Refix fix for sitting on non-root linked prims with explicit sit targ...Justin Clark-Casey (justincc)2013-11-231-1/+1
| * | Revert "fix avatar rotation when sitting on a linked part"Justin Clark-Casey (justincc)2013-11-231-1/+1
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-231-4/+5
| |\
| | * Fixed the update StoreRegionWindlightSettings() wasn't updating regionwindlig...Fernando Oliveira2013-11-221-4/+5
| * | fix avatar rotation when sitting on a linked partJustin Clark-Casey (justincc)2013-11-231-1/+1
| |/
| * Remove old *.exe.config files that related to programs that have long been de...Justin Clark-Casey (justincc)2013-11-233-89/+0
| * Refix fix for sitting on non-root linked prims with explicit sit targets.Justin Clark-Casey (justincc)2013-11-231-1/+1
| * Fix non-root prim sit positions for prims where a sit target has been specifi...Justin Clark-Casey (justincc)2013-11-231-1/+1
| * Stop .NET 4 complaining on Windows when it tries to load in DLLs that haven't...Justin Clark-Casey (justincc)2013-11-236-0/+8