aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-011-0/+16
|\
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+16
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+4
|\ \ | |/
| * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-311-0/+4
* | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
|\ \
| * \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\ \
| | * | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| * | | Reverse a senseless change in the prioritizer. Why I would want avatars to re...Melanie2012-07-311-3/+9
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\ \ \ | |/ /
| * | Fix an exception while outputting a log messageMelanie2012-07-291-1/+1
| * | See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
* | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-07-288-42/+144
|\ \ \ | | |/ | |/|
| * | Avoid a race condition between the scene shutdown thread and the update threa...Justin Clark-Casey (justincc)2012-07-271-3/+5
| * | Remove duplicated IScenePresence.PresenceType. This is already in ISceneAgen...Justin Clark-Casey (justincc)2012-07-271-2/+0
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-07-261-23/+46
| |\ \
| | * | When copying items, copy the item description field instead of the asset desc...Justin Clark-Casey (justincc)2012-07-261-23/+46
| * | | Add a Dispose() of the physics engine when a scene is being shutdown.Robert Adams2012-07-261-0/+9
| |/ /
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring wi...Justin Clark-Casey (justincc)2012-07-251-0/+1
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-252-2/+2
| * | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-254-10/+76
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-234-13/+23
| * | Committing Avination's memleak fix-a-thon, installment #3Melanie2012-07-231-0/+2
* | | Merge branch 'avination' into careminsterMelanie2012-07-234-13/+23
|\ \ \ | | |/ | |/|
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-234-13/+23
* | | Merge branch 'master' into careminsterMelanie2012-07-205-158/+202
|\ \ \ | | |/ | |/|
| * | Stop explicitly closing and nulling out Animator in order to prevent NREs in ...Justin Clark-Casey (justincc)2012-07-192-23/+7
| * | Prevent race conditions between two threads that call LLClientView.Close() si...Justin Clark-Casey (justincc)2012-07-191-3/+3
| * | Add TestCreateDuplicateRootScenePresence() regression test.Justin Clark-Casey (justincc)2012-07-193-1/+41
| * | Add basic TestCreateRootScenePresence() regression testJustin Clark-Casey (justincc)2012-07-191-135/+144
* | | Merge branch 'master' into careminsterMelanie2012-07-197-45/+115
|\ \ \ | |/ / | | / | |/ |/|
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled...Justin Clark-Casey (justincc)2012-07-194-16/+35
| * Add back notification to neighbouring regions when RegionReadyModule is not a...Justin Clark-Casey (justincc)2012-07-181-0/+3
| * Perform other region ready actions even if simulator is configured to leave l...Justin Clark-Casey (justincc)2012-07-183-21/+29
| * Fix bug where region ready was being triggered twice in quick succession if a...Justin Clark-Casey (justincc)2012-07-181-9/+12
| * Establish EventManager.OnRegionReady event. This will only be triggerred onc...Justin Clark-Casey (justincc)2012-07-182-3/+35
| * Pass entire scene object in OnLoginsEnabled event rather than just the region...Justin Clark-Casey (justincc)2012-07-182-5/+4
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-07-183-26/+16
| |\
| | * Close() the ScenePresence after we've removed it from the scene graph, to cut...Justin Clark-Casey (justincc)2012-07-181-10/+16
| * | Missing parameter in log error message was throwing exceptionDan Lake2012-07-181-1/+1
* | | Merge branch 'ubitwork' into avinationMelanie2012-07-174-51/+70
|\ \ \
| * | | minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| * | | fix our stats ( old schema )UbitUmarov2012-07-172-48/+66
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\ \ \
| * \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-172-16/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-1754-1302/+3004
| |\ \ \ \ \
| * | | | | | remove forgotten line...UbitUmarov2012-07-141-1/+0
| * | | | | | don't subscribe collision events for nonphysical parts only because ofUbitUmarov2012-07-142-1/+2
* | | | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-0/+1
| |_|_|/ / / |/| | | | |
* | | | | | Fix merge artefactsMelanie2012-07-173-10/+4
| |_|/ / / |/| | | |