aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-241-1/+1
|\
| * Merge branch 'master' into careminsterMelanie2011-12-231-1/+1
| |\
| | * fix the UsesPhysics flag to reference the physics flag rather than the tempon...Mic Bowman2011-12-221-1/+1
* | | Fix camera orientation for sit targets to use the prim actually sat on.Melanie2011-12-241-1/+1
|/ /
* | Merge branch 'master' into careminsterMelanie2011-12-224-8/+18
|\ \ | |/
| * rename Scene.m_physicalPrim to PhysicalPrims since its public and access exte...Justin Clark-Casey (justincc)2011-12-222-3/+3
| * Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-222-4/+2
| * Make it possible to force all prims to be phantom via the collidable_prim boo...Justin Clark-Casey (justincc)2011-12-222-1/+13
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+1
|\ \ | |/
| * And a typo fixMelanie2011-12-221-1/+1
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+6
|\ \ | |/
| * Add a few comments, correct a merge artefactMelanie2011-12-221-1/+6
| * Harmonizing SP with AvinationMelanie2011-12-221-41/+55
* | Merge branch 'master' into careminsterMelanie2011-12-221-117/+112
|\ \ | |/
| * Fixing a bug introduced yesterday. This put the precondition test inside Chec...Diva Canto2011-12-221-105/+109
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-211-4/+1
| |\
| * | Moved an external test into the method that uses those preconditions.Diva Canto2011-12-211-19/+11
* | | Merge branch 'master' into careminsterMelanie2011-12-201-5/+5
|\ \ \ | | |/ | |/|
| * | Though the viewer warns about receiving this, not sending appears to break ba...Justin Clark-Casey (justincc)2011-12-201-4/+1
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-208-194/+163
| |\
| * | Changed the async approach on close child agents. This may improve crossings ...Diva Canto2011-12-162-7/+7
* | | Merge branch 'master' into careminsterMelanie2011-12-192-6/+44
|\ \ \ | | |/ | |/|
| * | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a...Justin Clark-Casey (justincc)2011-12-192-6/+44
* | | Merge branch 'master' into careminsterMelanie2011-12-192-3/+15
|\ \ \ | |/ /
| * | Stop sending the viewer its own AvatarAppearance packet.Justin Clark-Casey (justincc)2011-12-191-1/+4
| * | Migrate detailed "appearance show" report generation up to AvatarFactoryModul...Justin Clark-Casey (justincc)2011-12-192-2/+11
* | | Merge branch 'master' into careminsterMelanie2011-12-187-234/+154
|\ \ \ | |/ /
| * | Fix bug where objects could not be set to a new group if the group had been c...Justin Clark-Casey (justincc)2011-12-174-17/+8
| * | refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim...Justin Clark-Casey (justincc)2011-12-172-142/+81
| * | Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-163-27/+10
| * | Don't pass on ChaneWaterHeight event from EventManager is new water height is...Justin Clark-Casey (justincc)2011-12-161-0/+6
| |/
| * No functional changes. Changed the prefix of that log message [CONNECTION BEG...Diva Canto2011-12-162-15/+15
| * Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() whe...Justin Clark-Casey (justincc)2011-12-151-6/+2
| * Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacterJustin Clark-Casey (justincc)2011-12-151-27/+32
* | Fix hit testing link sets properly. Fix raycasting for LSL.Melanie2011-12-171-6/+6
* | Merge branch 'master' into careminsterMelanie2011-12-142-11/+5
|\ \ | |/
| * Just adding a comment to SendFullUpdatToClientDan Lake2011-12-131-0/+2
| * Reorder clearing of upate schedule on SOP to before sending updates. Fix pote...Dan Lake2011-12-131-11/+3
* | Comment debug spamMelanie2011-12-131-1/+1
* | Prevent a nasty deadlock on teleportMelanie2011-12-121-24/+22
* | Make m_attachments privateMelanie2011-12-121-1/+1
* | Remove spammy log messages when querying sim healthMelanie2011-12-121-2/+14
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-124-47/+55
|\ \
| * \ Merge branch 'master' into careminsterMelanie2011-12-124-47/+55
| |\ \ | | |/
| | * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsCo...Dan Lake2011-12-124-46/+55
* | | Send changed animation event asynchronouslyMelanie2011-12-121-14/+17
|/ /
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-101-0/+1
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-102-119/+143
* | Merge branch 'master' into careminsterMelanie2011-12-103-53/+40
|\ \ | |/
| * Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-24/+38