aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Populate user preferences with UserAccount email if it is present, else ↵BlueWall2013-12-163-7/+73
| | | | | | | | | | | | return an error indicating no email is on record for the user.
| * | 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
| | | | | | | | | | | | | | | | bytes in utf8
| | * | 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 ↵Justin Clark-Casey (justincc)2013-12-141-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | try/catch as sometimes it appears that this can be corrupt. As per Oren's suggestion.
| | | * After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵Justin Clark-Casey (justincc)2013-12-142-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
| | | * Convert if-blocks to return statements in small functions such as ↵Eva Comaroski2013-12-141-15/+5
| | | | | | | | | | | | | | | | GetStartParameter().
| | * | 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
| | | | | | | | | | | | | | | | This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
| | | * 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 ↵Justin Clark-Casey (justincc)2013-12-142-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | NPC tests until positions are known to be stable. Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
| | * | Fix build break in test from previous commit 54cc229 - hadn't realized ↵Justin Clark-Casey (justincc)2013-12-141-1/+1
| | | | | | | | | | | | | | | | ScenePresence inst var name was slightly different
| | * | Fix TestSitAndStandWithNoSitTarget NPC and SP tests.Justin Clark-Casey (justincc)2013-12-143-15/+4
| | | | | | | | | | | | | | | | | | | | These stopped working because current code calculates sit heights based on avatar physics rather than appearance data. Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
| | * | 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 ↵Justin Clark-Casey (justincc)2013-12-111-3/+22
| | | | | | | | | | | | | | | | SP.HandleAgentSit()
| * | | This is the acutal sitting avatar crossing code. This commit implements theMelanie2013-12-161-2/+152
| |/ / | | | | | | | | | | | | | | | | | | | | | actual crossing mechanics for seated avatars, using the supporting code from the previous commits. Physics is not supported yet, although some few bits for them are already in place due to the earlier code drops. With this commit, crossing sitting avatar by "editing" the prim across the border, by using llSetPos or keyframe motion may already be possible. Vehicles will come next.
| * | Replace proprietary file header with BSD oneMelanie2013-12-111-6/+27
| | |
* | | Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminsterMelanie2014-01-050-0/+0
|\ \ \ | |/ /
| * | Add missing files *blush*Melanie2013-12-112-0/+176
| | |
* | | Merge commit '5b73b9c4a85335ba837280688b903fef44be8f35' into careminsterMelanie2014-01-050-0/+0
|\ \ \ | |/ /
| * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-1119-593/+1595
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
* | | Merge commit '3df8990e6ff6a5293b425e906cd381da9e0424a5' into careminsterMelanie2014-01-050-0/+0
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-111-2/+88
| |\ \ | | |/
* | | Merge commit '97934e00e667b6f432340a54671221a970a048d7' into careminsterMelanie2014-01-050-0/+0
|\ \ \ | |/ /
| * | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-112-239/+214
| | | | | | | | | | | | | | | but I don't know if it runs. Will probably crash and burn as the supporting code isn't there yet.
* | | Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminsterMelanie2014-01-051-2/+88
|\ \ \ | | |/ | |/|
| * | Add console utility commands "scale scene" and "translate scene". Note that ↵dahlia2013-12-101-2/+88
| |/ | | | | | | repeated use of these commands will induce floating point accumulation errors. Please back up your region before using.
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-0714-297/+36
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* | 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
| | | | | | | | | | | | | | | | to reduce mesh asset decoding failures
* | | | Merge branch 'master' into careminsterMelanie2013-12-0713-7904/+8421
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | 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
| | | | | | | | | | | | | | | | changed only by admin in backend.
| * | | Reversing back to the row["ColumnName"] case field name. ↵Fernando Oliveira2013-12-061-1/+1
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=6868
| * | | minor: Use enums for setting inv/asset types on data upload rather than ↵Justin Clark-Casey (justincc)2013-12-061-7/+7
| | | | | | | | | | | | | | | | magic numbers
| * | | Properly set InventoryType.Snapshot when a snapshot is uploadedJustin Clark-Casey (justincc)2013-12-061-0/+4
| | |/ | |/| | | | | | | | | | Resolves http://opensimulator.org/mantis/view.php?id=6857 This prevents the inventory service complaining later about an attempt to change an invariant
| * | Fix regression where mouse look flight direction no longer worked by zeroing ↵Justin Clark-Casey (justincc)2013-12-052-14/+26
| | | | | | | | | | | | | | | | | | | | | x/y rot before sending agent updates, instead of before any agent update processing It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook. Doing this in the terse send so that we preserve mouselook rotation information
| * | Ignore X and Y body rotations when sent by mouse look.Justin Clark-Casey (justincc)2013-12-031-3/+15
| |/ | | | | | | | | | | | | | | Fixes http://opensimulator.org/mantis/view.php?id=3274 When not in mouselook, avatar only sends rotations around the Z plane (since that's the only way an avatar can rotate). However, in mouselook it also sends X and Y information. But sending X and Y in terse updates causes issues with wrong camera movement in mouselook. So strip out X and Y components for now. If this is an issue, then could strip out before sending avatar terse update, though this generates more cpu work. Thanks to mirceakitsune for suggesting an initial fix
| * Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced ↵Justin Clark-Casey (justincc)2013-11-301-1/+1
| | | | | | | | for slow walk/run in 4cfe02a rather than the magic number
| * Remove unused SP.Updated flag, which appears unused for many years and was ↵Justin Clark-Casey (justincc)2013-11-301-10/+0
| | | | | | | | only set true once and never reset
| * Implement most effects of AGENT_CONTROL_STOPJustin Clark-Casey (justincc)2013-11-302-44/+104
| | | | | | | | | | | | | | | | | | | | AGENT_CONTROL_STOP is specified to SP.HandleAgentUpdate if the user holds down the space bar on a viewer. For a stopped avatar, this prevents fly or walk/run (though not rotate) until released. For a walking/running avatar, this reduces movement to half speed. For a flying avatar, this stops the avatar. These are observed behaviours on the LL grid - there was no previous OpenSimulator implementation This commit introduces an optional parameter to SP.AddNewMovement(), which means that it will no longer compile on .NET 3.5 or earlier versions of Mono than 2.8 Currently, this does not work for jumping, and if used whilst flying the avatar continues the fly animation even though it does not move