aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+9
|\
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-4/+1
|\ \ | |/
| * Fix avatar height managementMelanie2010-11-021-24/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-48/+50
|\ \ | |/
| * Fix sitting and standing upMelanie2010-11-021-5/+14
| * Move physics actor creation to after SetHeight to try and preventMelanie2010-10-301-11/+11
| * 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, commentin...Justin Clark-Casey (justincc)2010-10-291-5/+5
| * 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 careminster-presence-refactorMelanie2010-10-291-23/+50
|\ \ \ | |/ /
| * | 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
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-20/+46
| | * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-4/+5
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-123/+48
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-291-114/+48
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-211-115/+50
| | |\ \ | | | |/
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-201-114/+49
* | | | Comment repeated add and remove of avatars from the physical scene. It's noMelanie2010-10-251-16/+22
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-2/+0
|\ \ \ \ | |/ / /
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-3/+1
| * | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-211-1/+1
| * | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-0/+2
|\ \ \ | | |/ | |/|
| * | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-041-1/+1
* | Try to prevent threading issues in SP.SetAppearance by locking itMelanie2010-09-271-40/+45
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-1/+1
|\ \ | |/
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-1/+1
* | Some small bug fixesroot2010-09-161-1/+1
* | Fix merge issuesMelanie2010-09-141-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-2/+4
|\ \ | |/
| * minor: Add comments which explain what's going on wrt avatar movements at var...Justin Clark-Casey (justincc)2010-09-131-0/+2
| * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-131-9/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-1/+1
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-121-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-09-061-0/+21
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-0/+21
| |\ \ | | |/
| | * Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| | * Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3
| | * Add ScenePresence.GetAttachments(uint attachmentPoint)Justin Clark-Casey (justincc)2010-08-311-0/+21
* | | Falling animation fix, comment out instrumentation.Kitto Flora2010-09-061-2/+4
|/ /
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-09-021-1/+0
|\ \
| * | Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| * | Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3
* | | Fixes to JUMP system.Kitto Flora2010-09-021-22/+44
|/ /