aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-122-7/+7
|\
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-122-6/+6
| * If deserializing a scene object fails during IAR load then ignore the object ...Justin Clark-Casey (justincc)2012-01-111-1/+1
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-101-2/+0
| |\
| * | HG landing points: this hopefully fixes some confusion that was making HG avi...Diva Canto2012-01-101-5/+6
* | | Merge branch 'master' into careminsterMelanie2012-01-102-19/+32
|\ \ \ | | |/ | |/|
| * | Teleport DebuggingBlueWall2012-01-101-2/+0
| |/
| * Add some run-time debugging supportBlueWall2012-01-092-1/+6
| * Use our TeleportFlagsBlueWall2012-01-092-22/+30
| * TP Routing debugBlueWall2012-01-091-2/+5
* | Merge branch 'master' into careminsterMelanie2012-01-091-1/+20
|\ \ | |/
| * Fix teleport routing for incoming HG+OwnerBlueWall2012-01-091-18/+19
| * Debugging HG teleport routingBlueWall2012-01-091-0/+18
* | Merge branch 'master' into careminsterMelanie2012-01-091-2/+4
|\ \ | |/
| * Fix HG teleport routingBlueWall2012-01-091-2/+4
| * Fix a build breakMelanie2012-01-091-1/+1
| * Add the HG case to landing point checksMelanie2012-01-091-1/+1
| * Update teleport routing to match AvinationMelanie2012-01-081-16/+58
| * Fix teleport routingBlueWall2012-01-081-0/+17
* | Update teleport routing to match AvinationMelanie2012-01-081-1/+2
* | Merge branch 'master' into careminsterMelanie2012-01-072-20/+22
|\ \ | |/
| * Add method doc to SPA.Falling and use automatic private get propertyJustin Clark-Casey (justincc)2012-01-071-13/+14
| * Fix bug where tapping home to stop falling would stop any avatar movement oth...Justin Clark-Casey (justincc)2012-01-072-9/+10
| * If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-16/+39
* | If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-5/+24
* | That needs to be callable from elsewhere!Melanie2012-01-051-1/+1
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-054-5/+30
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-055-12/+33
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-054-5/+30
| | |\
| | | * Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-042-0/+25
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-035-177/+209
| | | |\
| | | | * commented out "Prevented flyoff" log message for now as this becomes problema...Justin Clark-Casey (justincc)2012-01-031-1/+1
| | | * | Access to these static methods to serialize objects are useful outside of ser...Dan Lake2012-01-031-4/+4
| | * | | Small fix to GetWorldPosition to get closer to Avination sit behaviorMelanie2012-01-051-10/+4
| | | |/ | | |/|
* | | | Clean up GetWorldPositionMelanie2012-01-051-7/+3
* | | | Prevent spurious "CHANGED_POSITION" during region backupMelanie2012-01-051-3/+4
|/ / /
* | | Merge branch 'master' into careminsterMelanie2012-01-021-13/+20
|\ \ \ | |/ /
| * | Bug fix in map tiles in standalone: the map has been blank since commit 01ae9...Diva Canto2011-12-301-13/+20
* | | 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