aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-2519-120/+107
|\
| * Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ...Justin Clark-Casey (justincc)2012-11-243-106/+83
| * Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInv...Justin Clark-Casey (justincc)2012-11-241-7/+12
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which automati...Justin Clark-Casey (justincc)2012-11-2417-17/+17
| * minor: Make note in log if scene was restarted due to an unrecoverable physic...Justin Clark-Casey (justincc)2012-11-231-1/+6
* | Merge branch 'master' into careminsterMelanie2012-11-233-19/+81
|\ \ | |/
| * Fix problem where restarting the currently selected region would stop various...Justin Clark-Casey (justincc)2012-11-232-31/+25
| * Add regression test for checking scene close when SceneManager is asked to closeJustin Clark-Casey (justincc)2012-11-231-0/+58
* | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
* | Merge branch 'master' into careminsterMelanie2012-11-231-0/+7
|\ \ | |/
| * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-0/+7
* | Merge branch 'master' into careminsterMelanie2012-11-201-3/+20
|\ \ | |/
| * Minor formatting for 0962a35d and a few one-line comments as to why that code...Justin Clark-Casey (justincc)2012-11-201-8/+7
| * Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
* | Merge branch 'avination' into careminsterMelanie2012-11-173-5/+28
|\ \
| * \ Merge branch 'ubitwork' into avinationMelanie2012-11-061-5/+10
| |\ \
| | * | actually remove the use of random on persist timmingsUbitUmarov2012-11-021-4/+6
| | * | Create a new random when needed using normal time based seed instead ofUbitUmarov2012-11-021-2/+5
| | * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-305-16/+55
| | |\ \
| * | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> Even...teravus2012-11-042-0/+18
* | | | | Merge branch 'master' into careminsterMelanie2012-11-123-97/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Stop closing old style modulesMelanie2012-11-121-9/+0
| * | | | Remove the old style module loader and all references to itMelanie2012-11-123-88/+12
* | | | | Merge branch 'master' into careminsterMelanie2012-11-112-35/+70
|\ \ \ \ \ | |/ / / /
| * | | | Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() a...Justin Clark-Casey (justincc)2012-11-102-35/+70
* | | | | Merge branch 'avination' into careminsterMelanie2012-11-043-2/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-11-012-1/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | more debugUbitUmarov2012-10-281-0/+2
| | * | | remove pre physics build testingUbitUmarov2012-10-281-1/+1
| | * | | Add some extra debug on scene closeUbitUmarov2012-10-281-1/+9
| * | | | Make sure we're not accessing a physics scene if we're not in one yet.Melanie2012-10-301-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-11-031-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
* | | | Merge branch 'master' into careminsterMelanie2012-11-011-1/+1
|\ \ \ \ | |/ / /
| * | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ...Dan Lake2012-10-311-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-10-311-14/+35
|\ \ \ \ | |/ / /
| * | | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-17/+35
* | | | Merge branch 'master' into careminsterMelanie2012-10-313-6/+24
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-301-5/+9
| |\ \ \
| | * | | Only create a new list to check if objects have reached targets if there actu...Justin Clark-Casey (justincc)2012-10-301-5/+9
| * | | | Store and send the current movement animation state to a new sim on crossingMelanie2012-10-302-0/+17
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2012-10-301-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Set the script state to new rez when a scriptis saved, rather than region start.Melanie2012-10-281-1/+1
* | | | Put back the collision sound shim into SOPMelanie2012-10-301-0/+29
* | | | Merge branch 'master' into careminsterMelanie2012-10-303-155/+5
|\ \ \ \ | | |/ / | |/| |
| * | | shuffling code around so that the interface for ISoundModule.SendSound() spec...SignpostMarv2012-10-291-1/+1
| * | | moving SendSound from SceneObjectPart to ISoundModuleSignpostMarv2012-10-291-79/+9
| * | | fixing a bug in SceneObjectPart.SendSound where sounds would always come from...SignpostMarv2012-10-291-9/+8
| * | | Factoring out a superfluous local variable & repeated assignment in SceneObje...SignpostMarv2012-10-291-10/+8
| * | | removing superfluous lines from SceneObjectPart.SendSoundSignpostMarv2012-10-291-8/+0