aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-062-3/+136
* | | Merge branch 'avination' into careminsterMelanie2013-02-072-0/+9
|\ \ \ | | |/ | |/|
| * | Rename Bounciness to RestitutionMelanie2013-02-072-6/+6
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-062-0/+9
| * | * This adds a bit more to the previous flying roll effect by adding additiona...teravus2013-01-311-10/+50
| * | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...Melanie2013-01-311-0/+81
* | | Rename Bounciness to RestitutionMelanie2013-02-072-6/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-064-143/+1
|\ \ \ | | |/ | |/|
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-5/+0
| * | Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-064-168/+107
|\ \ \ | |/ /
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-063-168/+0
| * | Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would retu...Justin Clark-Casey (justincc)2013-02-061-15/+0
| * | refactor: Move functions that lookup asset ids from task inventory or pass th...Justin Clark-Casey (justincc)2013-02-061-0/+122
* | | Merge branch 'master' into careminsterMelanie2013-02-052-0/+23
|\ \ \ | |/ /
| * | Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-052-1/+24
| |\ \
| | * | Added DynAttrs to the serialized XML format of prims. When copying prims, use...Oren Hurvitz2013-01-252-0/+16
| | * | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-251-2/+2