aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmergeMelanie2011-10-121-29/+3
|\
| * Instead of adding stat agentMS in all kinds of places, calculate it instead i...Justin Clark-Casey (justincc)2011-10-061-29/+3
* | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-011-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-211-1/+10
| |\
* | \ Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmergeMelanie2011-10-111-5/+5
|\ \ \ | |/ /
| * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-111-1/+10
|\ \ \ | | |/ | |/|
| * | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-221-1/+10
| |/
* | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmergeMelanie2011-10-111-8/+0
|\ \ | |/
| * Remove unused and never set SP.PreviousRotationJustin Clark-Casey (justincc)2011-09-211-8/+0
| * get rid of an incredibly noisy logging message from the last commitJustin Clark-Casey (justincc)2011-09-211-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-211-10/+14
| |\
* | \ Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmergeMelanie2011-10-111-1/+16
|\ \ \ | |/ /
| * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-211-2/+21
* | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmergeMelanie2011-10-111-9/+13
|\ \ \ | | |/ | |/|
| * | Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
| |/
* | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmergeMelanie2011-10-111-0/+4
|\ \ | |/
| * On setting a new avatar appearance, if height hasn't changed then don't set t...Justin Clark-Casey (justincc)2011-09-171-0/+4
* | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmergeMelanie2011-10-111-0/+10
|\ \ | |/
| * Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-161-0/+10
* | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmergeMelanie2011-10-111-0/+4
|\ \ | |/
| * minor: I was wrong about OffsetPosition - sometimes it genuinely does return ...Justin Clark-Casey (justincc)2011-09-161-0/+4
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-111-3/+13
|\ \ | |/
| * Remove setter from SP.OffsetPosition, since all sets should flow through SP.A...Justin Clark-Casey (justincc)2011-09-161-3/+14
* | Fixed a movement regression - Kitto's jump code is no longer needed (plus it'...Tom2011-09-141-37/+9
* | Bring us up to date.Tom2011-09-141-82/+51
|\ \ | |/
| * Don't try and delete attachments for child agent closeJustin Clark-Casey (justincc)2011-09-131-1/+2
| * eliminate redundant SP.m_regionInfo since it always has the scene.Justin Clark-Casey (justincc)2011-09-121-8/+6
| * remove the unused SP.initializeScenePresence()Justin Clark-Casey (justincc)2011-09-121-23/+2
| * stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is...Justin Clark-Casey (justincc)2011-09-121-4/+4
| * Start locking entire add/remove operations on an IScenePresence.AttachmentsSy...Justin Clark-Casey (justincc)2011-09-121-0/+4
| * lock attachments when enumerating through them in ScenePresence.CopyTo().Justin Clark-Casey (justincc)2011-09-101-20/+24
| * Add extra log information when attachments fail validationJustin Clark-Casey (justincc)2011-09-101-1/+9
| * Try disabling the inconsistent attachment state check to see if this actually...Justin Clark-Casey (justincc)2011-09-051-9/+7
* | Merge fixes, and fix the buildTom2011-09-141-97/+1
* | First set of merge fixesTom2011-09-071-231/+78
* | Resolve merge commits, stage 1Tom2011-09-041-241/+336
|\ \ | |/
| * Stop NPCs losing attachments when the source avatar takes them off.Justin Clark-Casey (justincc)2011-09-031-3/+0
| * move common code into AttachmentsModule.DeleteAttachmentsFromScene()Justin Clark-Casey (justincc)2011-08-311-13/+1
| * refactor: move multiple class to set avatar height into associated SP.AddToPh...Justin Clark-Casey (justincc)2011-08-311-16/+2
| * get rid of appearance null checks - this is never nullJustin Clark-Casey (justincc)2011-08-311-35/+15
| * remove pointless m_attachments == null check since this field is never nullJustin Clark-Casey (justincc)2011-08-311-1/+1
| * minor: seal up another instance of using the appearance list without lockingJustin Clark-Casey (justincc)2011-08-311-1/+2
| * Make SP.Attachments available as sp.GetAttachments() instead.Justin Clark-Casey (justincc)2011-08-311-13/+38
| * minor: remove already processed avatar null check in Scene.RemoveClient()Justin Clark-Casey (justincc)2011-08-301-4/+0
| * refactor: move SP.SaveChangedAttachments() fully into AttachmentsModuleJustin Clark-Casey (justincc)2011-08-301-24/+1
| * refactor: Move ScenePresence.RezAttachments() into AttachmentsModuleJustin Clark-Casey (justincc)2011-08-301-45/+1
| * Fix bug in persisting saved appearances for npcsJustin Clark-Casey (justincc)2011-08-301-3/+3
| * Stop avatars returning from neighbouring regions from stalling on the border ...Justin Clark-Casey (justincc)2011-08-271-3/+22