aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add a TeleportFlags member to SP so we can tell how we got there.Melanie2011-01-271-0/+11
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-01-171-4/+4
|\
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-1/+1
| |
| * Prune some of the excess logging for client logins.Justin Clark-Casey (justincc)2011-01-181-3/+3
| | | | | | | | Didn't touch the appearance related stuff.
* | Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, ↵Diva Canto2011-01-171-8/+0
|/ | | | because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether.
* Revert "DEBUG DEBUG DEBUG"Diva Canto2011-01-171-4/+0
| | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5.
* DEBUG DEBUG DEBUGDiva Canto2011-01-171-0/+4
|
* Note to self: try to make only 3 things at the same time.Diva Canto2011-01-041-1/+1
|
* Guard against null Animator.Diva Canto2011-01-041-1/+2
|
* Put the coarse location updates back to 50 frames, otherwise the dots on the ↵Diva Canto2010-12-191-2/+2
| | | | mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
* Yet more things out of the main Update thread loop and into threadlets. This ↵Diva Canto2010-12-141-1/+4
| | | | time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
* Commented out the UpdateLand call from the Update thread loop, because this ↵Diva Canto2010-12-141-0/+1
| | | | may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
* Null checking ParentGroup is not needed. It can't be null.Melanie2010-12-141-4/+2
|
* This seems to get rid of the stuck PREJUMP animation, as reported by Justin ↵Diva Canto2010-12-131-2/+5
| | | | in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others.
* Trigger event with flag CHANGED_LINK when agent sits on objects that have ↵Marck2010-12-121-2/+6
| | | | not a sit target defined. This fixes Mantis #4692.
* Fixes the nudge movements!Diva Canto2010-12-111-27/+0
|
* Revert "Another stab at mantis #5256"Diva Canto2010-12-101-12/+6
| | | | This reverts commit ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47.
* Another stab at mantis #5256Diva Canto2010-12-101-6/+12
|
* Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-051-1/+1
| | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-051-115/+160
|\
| * Various bug fixes for appearance handling: more aggressive reset of textures ↵Mic Bowman2010-12-031-16/+30
| | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging.
| * Reformat an overzealous comment. Remove end of line marks and reference to theMelanie2010-11-271-21/+24
| | | | | | | | | | Mantis solved, as that isn't needed to understand the code. Reformat the comment for 80 col screens.
| * llUnsit position fix 4063 (updated 11-20-2010)Micheil Merlin2010-11-271-2/+27
| |
| * Refactor appearance and avatar data sending code. Paritioning the routines ↵Mic Bowman2010-11-271-114/+117
| | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes.
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-211-0/+23
|\ \ | |/
| * Prevent leftover attachments from clogging up the pipesMelanie2010-11-161-1/+4
| |
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+20
| | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
* | Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-211-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Formatting cleanup.Jeff Ames2010-11-081-1/+1
| |
* | Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-29/+34
|\ \ | |/
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| | | | | | | | on incoming transfers in all cases.
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
| |
| * Fix avatar height managementMelanie2010-11-021-24/+11
| |
| * Fix sitting and standing upMelanie2010-11-021-5/+14
| |
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-11/+11
|\ \ | |/
| * Move physics actor creation to after SetHeight to try and preventMelanie2010-10-301-11/+11
| | | | | | | | bowlegginess. Didn't work but is better this way anyway.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-10/+16
|\ \ | |/
| * tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| |
| * Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-291-5/+5
| | | | | | | | commenting out most of them as per Mic
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-291-3/+9
| |\
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
| | |
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-20/+46
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-291-23/+50
| |\ \
| | * | Clean up some cruft from the last commit. Re-add the initial updateMaster ScienceSim2010-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | send in the scene presence constructor... need to figure this out later.
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-20/+46
| | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| * | | Merge branch 'dev-appearance'Melanie2010-10-291-114/+48
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-211-115/+50
| | |\ \ | | | | | | | | | | | | | | | dev-appearance
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-118/+51
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs