aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix more merge artefactsMelanie2012-04-031-3/+3
* Remove duplicate implementation of Material { get; set; }Melanie2012-04-031-14/+0
* Fix merge artefactsMelanie2012-04-032-27/+2
* Merge branch 'master' into careminsterMelanie2012-04-034-107/+201
|\
| * Eliminate race condition where many callers would check SOP.PhysicsActor != n...Justin Clark-Casey (justincc)2012-04-034-150/+204
* | Merge branch 'master' into careminsterMelanie2012-03-315-62/+58
|\ \ | |/
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the...Justin Clark-Casey (justincc)2012-03-315-29/+29
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con...Justin Clark-Casey (justincc)2012-03-312-32/+21
| * minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-1/+7
| * Add back parts of reverted changes that were not concerned with child agent c...Justin Clark-Casey (justincc)2012-03-292-1/+6
| * Revert "Simplify friends caching by only doing this for root agents - no func...Justin Clark-Casey (justincc)2012-03-292-3/+1
| * Revert "Add comment about setting client.SceneAgent in AddNewClient()"Justin Clark-Casey (justincc)2012-03-291-3/+0
* | Merge branch 'master' into careminsterMelanie2012-03-293-17/+6
|\ \ | |/
| * Add comment about setting client.SceneAgent in AddNewClient()Justin Clark-Casey (justincc)2012-03-291-0/+3
| * Simplify friends caching by only doing this for root agents - no functions re...Justin Clark-Casey (justincc)2012-03-282-1/+3
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac...Diva Canto2012-03-281-16/+0
* | Merge branch 'master' into careminsterMelanie2012-03-282-15/+18
|\ \ | |/
| * More on switching the root folder from under the viewer. More experiments.Diva Canto2012-03-272-15/+18
* | Merge branch 'master' into careminsterMelanie2012-03-281-4/+11
|\ \ | |/
| * HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-271-4/+11
* | Merge branch 'master' into careminsterMelanie2012-03-281-2/+10
|\ \ | |/
| * minor: Add some documentation to OnNewClient and OnClientClosed eventsJustin Clark-Casey (justincc)2012-03-281-2/+10
* | Merge branch 'master' into careminsterMelanie2012-03-271-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-2720-591/+779
| |\
| * | When loading objects from DB, first add to scene, then call TriggerOnSceneObj...Dan Lake2012-03-271-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-03-271-0/+8
|\ \ \ | | |/ | |/|
| * | HG: beginning of a more restrictive inventory access procedure (optional). Ex...Diva Canto2012-03-271-0/+8
* | | Merge branch 'master' into careminsterMelanie2012-03-231-0/+16
|\ \ \ | |/ /
| * | Comment out log message about sending periodic appearance updates.Justin Clark-Casey (justincc)2012-03-231-2/+2
| * | Add experimental SendPeriodicAppearanceUpdates = true/false setting to [Start...Justin Clark-Casey (justincc)2012-03-231-0/+17
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-231-14/+29
|\ \ \
| * | | Make anims way more snappy. Decouple SP animation handling from physics frameMelanie2012-03-231-14/+29
* | | | Merge branch 'master' into careminsterMelanie2012-03-231-14/+77
|\ \ \ \ | | |/ / | |/| |
| * | | Add a scene maintenance thread in parallel to the heartbeat thread. The main...Justin Clark-Casey (justincc)2012-03-231-14/+77
* | | | Merge branch 'master' into careminsterMelanie2012-03-232-56/+70
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method...Justin Clark-Casey (justincc)2012-03-231-17/+20
| * | Rename Scene.StartTimer() to Start() - this method no longer uses a timer. C...Justin Clark-Casey (justincc)2012-03-231-24/+25
| * | Fix build breakJustin Clark-Casey (justincc)2012-03-231-1/+1
| * | Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769eJustin Clark-Casey (justincc)2012-03-232-3/+3
| * | Comment out unused scene loop restart code.Justin Clark-Casey (justincc)2012-03-231-19/+22
| * | Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpda...Justin Clark-Casey (justincc)2012-03-231-2/+2
| * | Add commented out section on collisions switch in Scene.SetSceneCoreDebug().Justin Clark-Casey (justincc)2012-03-231-0/+6
| * | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in M...Justin Clark-Casey (justincc)2012-03-221-11/+8
* | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-223-10/+12
|\ \ \ | |/ /
| * | Fix llGiveInventory() so that it checks the destination part for AllowInvento...Justin Clark-Casey (justincc)2012-03-221-5/+5
| * | Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-222-5/+7
* | | Merge branch 'master' into careminsterMelanie2012-03-226-102/+190
|\ \ \ | |/ /
| * | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-221-17/+0
| * | Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-221-0/+17