aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-142-3/+55
|\
| * Make llGetObjectDetails() return the correct world rotation for a sitting avatarJustin Clark-Casey (justincc)2013-03-141-5/+35
| * Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this...Justin Clark-Casey (justincc)2013-03-131-1/+0
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+22
| * minor: remove mono compiler warning in SceneObjectUndoRedoTestsJustin Clark-Casey (justincc)2013-03-111-2/+2
* | Merge branch 'master' into careminsterMelanie2013-03-111-0/+17
|\ \ | |/
| * * Apparently, sometimes texture entries come in from the wire with no default...teravus2013-03-081-0/+17
* | Merge branch 'master' into careminsterMelanie2013-03-083-121/+176
|\ \ | |/
| * Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-5/+22
| * Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-063-121/+159
* | * Separate two if trees that got merged into one if tree with borked logic.teravus2013-03-061-2/+25
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \
| * | Multiattach, part 1Melanie2013-03-051-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-03-051-2/+10
|\ \ \ | | |/ | |/|
| * | Move AllowedClients and BannedClients section to new [AccessControl] section ...Justin Clark-Casey (justincc)2013-03-021-2/+10
* | | Merge branch 'avination' into careminsterMelanie2013-03-032-18/+38
|\ \ \ | | |/ | |/|
| * | Make Keyframe motion cross regions againMelanie2013-03-032-2/+4
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-16/+34
* | | Merge branch 'master' into careminsterMelanie2013-02-282-18/+13
|\ \ \ | | |/ | |/|
| * | Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-281-2/+2
| * | Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-271-16/+11
* | | Merge branch 'master' into careminsterMelanie2013-02-261-2/+9
|\ \ \ | |/ /
| * | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-2/+9
* | | Merge branch 'master' into careminsterMelanie2013-02-231-0/+6
|\ \ \ | |/ /
| * | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set...Justin Clark-Casey (justincc)2013-02-221-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+5
|\ \ \ | |/ /
| * | * Fix walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
* | | Merge branch 'master' into careminsterMelanie2013-02-163-5/+5
|\ \ \ | |/ /
| * | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-163-5/+5
* | | Merge branch 'master' into careminsterMelanie2013-02-152-1/+60
|\ \ \ | |/ /
| * | Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-20/+75
|\ \ \ | | |/ | |/|
| * | Revert "Make keyframes use the sim's frame timer"Melanie2013-02-121-8/+15
| * | Revert "Push updates from keyframe directly to the front of the output queue ...Melanie2013-02-123-24/+9
| * | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-123-9/+24
| * | Make keyframes use the sim's frame timerMelanie2013-02-111-15/+8
| * | Refactor KeyframeMotion to use one timer class per sceneMelanie2013-02-111-20/+75
| * | Actually plumb the new values to physics.Melanie2013-02-071-0/+20
* | | Merge branch 'master' into careminsterMelanie2013-02-102-2/+18
|\ \ \ | | |/ | |/|
| * | Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| * | Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
* | | Merge branch 'master' into careminsterMelanie2013-02-081-4/+18
|\ \ \ | |/ /
| * | If a component of a coalesced object fails to deserialization, do not add a n...Justin Clark-Casey (justincc)2013-02-081-4/+18
* | | Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\ \ \ | |/ /
| * | Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| * | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-071-37/+152
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-072-2/+24
| * | Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-071-50/+6
| * | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-6/+50
| * | Rename "Bounciness" to "Restitution"Melanie2013-02-072-6/+6