aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into varregionRobert Adams2013-12-203-7/+67
|\
| * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-193-7/+67
| |\
| | * Add missing viewer param elements for butt and breast physics.Justin Clark-Casey (justincc)2013-12-191-1/+75
| | * Create regression test TestSendAgentGroupDataUpdate() for groups agent data s...Justin Clark-Casey (justincc)2013-12-183-7/+67
* | | Merge branch 'master' into varregionRobert Adams2013-12-1750-1244/+2740
|\ \ \ | |/ /
| * | Fix issue with editing notes for other avatarsBlueWall2013-12-162-2/+6
| * | Populate user preferences with UserAccount email if it is present, else retur...BlueWall2013-12-163-7/+73
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-1611-84/+97
| |\ \
| | * \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-1/+1
| | |\ \ | | | |/
| | | * Extend TestLlGetNotecardLine() regression test to contain chars that are two ...Justin Clark-Casey (justincc)2013-12-141-1/+1
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-15/+15
| | |\ \ | | | |/
| | | * ParseNotecardToList() returned data past end of notecard text (mantis #6881).Kevin Cozens2013-12-141-15/+15
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-144-23/+24
| | |\ \ | | | |/
| | | * Wrap analysis of the particle system in the UUID Gatherer in a separate try/c...Justin Clark-Casey (justincc)2013-12-141-3/+12
| | | * After previous discussion, put eye-catcher 'SCRIPT READY' messages to console...Justin Clark-Casey (justincc)2013-12-142-5/+7
| | | * Convert if-blocks to return statements in small functions such as GetStartPar...Eva Comaroski2013-12-141-15/+5
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-16/+22
| | |\ \ | | | |/
| | | * Make WindParamSet success a console message rather than a log message.Justin Clark-Casey (justincc)2013-12-141-2/+1
| | | * minor: Make wind console commands print out to console rather than logJustin Clark-Casey (justincc)2013-12-141-14/+21
| | * | Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and N...Justin Clark-Casey (justincc)2013-12-142-11/+11
| | * | Fix build break in test from previous commit 54cc229 - hadn't realized SceneP...Justin Clark-Casey (justincc)2013-12-141-1/+1
| | * | Fix TestSitAndStandWithNoSitTarget NPC and SP tests.Justin Clark-Casey (justincc)2013-12-143-15/+4
| | * | Eliminate unnecessary line from my previous commit 1d605642Justin Clark-Casey (justincc)2013-12-131-2/+0
| | * | Refix sitting on child prims by reinserting relevant code back into SP.Handle...Justin Clark-Casey (justincc)2013-12-111-3/+22
| * | | This is the acutal sitting avatar crossing code. This commit implements theMelanie2013-12-161-2/+152
| |/ /
| * | Replace proprietary file header with BSD oneMelanie2013-12-111-6/+27
| * | Add missing files *blush*Melanie2013-12-112-0/+176
| * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-1119-593/+1595
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-111-2/+88
| |\ \ | | |/
| | * Add console utility commands "scale scene" and "translate scene". Note that r...dahlia2013-12-101-2/+88
| * | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-112-239/+214
| |/
| * 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-0617-59/+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-061-9/+5
* | | | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-1428-161/+137
* | | | Merge branch 'master' into varregionRobert Adams2013-12-057-18/+40
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| |/
* | Merge branch 'master' into varregionRobert Adams2013-12-019-7898/+8435
|\ \ | |/
| * 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