aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-04-2722-210/+164
|\ \ \ | |/ /
| * | Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-2720-173/+92
| * | Tweak log messages on local region to region teleport path to help with probl...Justin Clark-Casey (justincc)2012-04-261-1/+4
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-261-0/+30
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-04-262-5/+5
| | |\ \
| | * \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-265-12/+89
| | |\ \ \
| | * | | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-261-0/+30
| * | | | | Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing ana...Justin Clark-Casey (justincc)2012-04-261-35/+35
| | |_|/ / | |/| | |
| * | | | minor: Add avatar name to removing agent log messageJustin Clark-Casey (justincc)2012-04-261-2/+2
| * | | | Comment out avatar move to target message for now.Justin Clark-Casey (justincc)2012-04-251-3/+3
| | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-251-2/+40
| |\ \ \
| | * | | Port Avination link order to make OpenSim behave like SL. Make Primstar scrip...Melanie2012-04-251-2/+40
| * | | | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-252-1/+3
| |/ / /
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-271-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Help big boobies to dance (avatar visualParams). May not persist and need mor...UbitUmarov2012-04-261-1/+1
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-254-40/+115
|\ \ \ \ | |/ / /
| * | | set PIDHoverTau and not PIDTau since all physics need thatUbitUmarov2012-04-251-5/+7
| * | | SOG bug fix in UI object changesUbitUmarov2012-04-241-11/+20
| * | | fix animations if sited in ground alsoUbitUmarov2012-04-241-1/+1
| * | | "save the catgirls"UbitUmarov2012-04-242-18/+13
| * | | display heatbeat sleep time in stats. This may not be good for general use, ...UbitUmarov2012-04-241-0/+5
| * | | fix Simulation time reportUbitUmarov2012-04-241-0/+7
| * | | some reduction on time resolution efects on spare time reportUbitUmarov2012-04-241-4/+8
| * | | *testing* changed stats time reports to be per reported frame and not acumul...UbitUmarov2012-04-241-11/+64
* | | | Merge branch 'master' into careminsterMelanie2012-04-251-5/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Commit the avination Teleport() methods (adaptedto justincc's changes)Melanie2012-04-251-1/+12
* | | | Merge branch 'master' into careminsterMelanie2012-04-252-8/+37
|\ \ \ \ | |/ / /
| * | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-251-16/+0
| * | | Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-252-0/+42
| | |/ | |/|
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-234-26/+109
|\ \ \ | | |/ | |/|
| * | fix a bug i added fixing another....UbitUmarov2012-04-221-2/+5
| * | changed seletion code. SOP now knows about parts selection. UI actions are se...UbitUmarov2012-04-203-24/+104
* | | Merge branch 'master' into careminsterMelanie2012-04-236-14/+33
|\ \ \ | | |/ | |/|
| * | Mantis 5977 Corrections to llRegionSayToTalun2012-04-232-4/+24
| * | Make TestSetPhysicsSinglePrim() actually add the object to the scene in order...Justin Clark-Casey (justincc)2012-04-221-0/+2
| * | Fix bug where setting phantom on a prim would result in a server log message ...Justin Clark-Casey (justincc)2012-04-223-12/+13
* | | Merge branch 'master' into careminsterMelanie2012-04-223-9/+129
|\ \ \ | |/ /
| * | Add test for setting physics in a linksetJustin Clark-Casey (justincc)2012-04-211-2/+28
| * | Add regression test for prim status when root prim in a new linkset is non-ph...Justin Clark-Casey (justincc)2012-04-212-1/+20
| * | Fix a bug where linking a non-physical prim with a physical prim as root woul...Justin Clark-Casey (justincc)2012-04-212-0/+22
| * | Add test for correct physics status on linking two physics objectsJustin Clark-Casey (justincc)2012-04-211-2/+26
| * | refactor: extract common setup code in SceneObjectStatusTestsJustin Clark-Casey (justincc)2012-04-211-10/+16
| * | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-212-3/+26
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-204-14/+57
|\ \ \ | | |/ | |/|
| * | changed - VolumeDetect and phantom setting interaction. Script VD(true) forc...UbitUmarov2012-04-192-13/+40
| * | Allow setting a specific target velocity on TeleportWithMomentumMelanie2012-04-181-1/+11
| * | Prevent objects rezzed in sim from being seen as attachments and becoming une...Melanie2012-04-171-0/+6
* | | Merge branch 'master' into careminsterMelanie2012-04-184-1/+107
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-181-0/+48
| |\ \
| | * | This commit adds a new optional region module, JsonStore, that provides struc...Mic Bowman2012-04-171-0/+48