aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Comment repeated add and remove of avatars from the physical scene. It's noMelanie2010-10-251-16/+22
| | | | longer needed.
* 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
| | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * * 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
| |/ | | | | | | | | | | * 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>
* | 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
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-1/+1
| | | | | | | | MapAndArray collection
* | 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 ↵Justin Clark-Casey (justincc)2010-09-131-0/+2
| | | | | | | | various points in the main scene loop and associated methods
| * 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
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Formatting cleanup.Jeff Ames2010-09-121-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-09-061-0/+21
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ 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 ↵Kitto Flora2010-09-021-1/+0
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | 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
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-4/+4
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-261-3/+4
| |
| * Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-261-1/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-1/+2
|\ \ | |/
| * refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵Justin Clark-Casey (justincc)2010-08-131-1/+1
| | | | | | | | same name
* | Fix a nullref issue in the AgentSetAppearance packet handler when removing ↵meta72010-08-101-6/+11
| | | | | | | | the physactor from the scene
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-101-5/+0
|\ \ | |/
| * Removed abstract SetText method from EntityBase to make cleaner API.Mikko Pallari2010-08-101-5/+0
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Remove 4000+ DOS line endings. Grrr!Melanie2010-08-101-4332/+4332
| |
* | The real fix for unscripted sit positions. This one doesn't fuck everything ↵meta72010-08-071-1/+4
| | | | | | | | else up. Promise.
* | Reverted: * Fix the unscripted sit rotation being incorrect .. will commit ↵meta72010-08-071-7/+3
| | | | | | | | a proper fix now.
* | Increase sit distance to 256 meters, but leave the initial autopilot process ↵meta72010-08-071-1/+1
| | | | | | | | in the picture so sit position can still be raycast by the existing code.
* | Get rid of some debug chatter that someone who can't spell left behind. ;)meta72010-08-071-2/+1
| |
* | Fix the unscripted sit rotation being incorrect (relative to the prim). Note ↵meta72010-08-071-3/+7
| | | | | | | | that unscripted sit offset is still really poor but this is not something i'm prepared to spend time on fixing.
* | Fix the distance from which autopilot is negated when sitting on an ↵meta72010-08-071-1/+3
| | | | | | | | unscripted prim - and also add some more Velocity code to ensure it gets set to zero in all cases
* | It seems hippo disregards velocities in full updates, so also send a terse ↵meta72010-08-071-4328/+4328
| | | | | | | | update when an agent sits to avoid drifting off
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-061-1/+6
|\ \ | |/
| * Correct some script constants.Melanie2010-08-061-1/+1
| |
| * Addresses http://opensimulator.org/mantis/view.php?id=4919Diva Canto2010-08-051-1/+6
| |
| * Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+33
| |
* | Make sure the avatar position gets moved along with a prim it is sitting on. ↵Tom2010-08-061-0/+13
| | | | | | | | This fixes mantis #208 and (maybe) issues with chat and sound coming from the wrong place when sat on a vehicle.