aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-168-219/+282
|\
| * Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format...Justin Clark-Casey (justincc)2012-05-163-115/+5
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-155-523/+202
| |\
| * | Fix issue where loading OARs could sometimes result in link numbers being reo...Justin Clark-Casey (justincc)2012-05-154-6/+72
| * | Allow use of regular expressions in "show object name", "show part name" and ...Justin Clark-Casey (justincc)2012-05-152-101/+208
* | | Merge branch 'avination' into careminsterMelanie2012-05-155-64/+204
|\ \ \
| * | | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coeren...UbitUmarov2012-05-151-2/+5
| * | | sop colisions don't play sounds on volume detectorsUbitUmarov2012-05-151-1/+1
| * | | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision...UbitUmarov2012-05-151-48/+118
| * | | ubitODE: if stopped having collisions do report zero colisions once, so colli...UbitUmarov2012-05-152-9/+43
| * | | ubitODE: fix not reporting land collisions on same cases.UbitUmarov2012-05-151-2/+25
| * | | Port the mel/dahlia fixMelanie2012-05-152-1/+11
| * | | don't send colision events to volume detectorsUbitUmarov2012-05-151-1/+2
| * | | Merge branch 'ubitwork' into avinationMelanie2012-05-151-4/+14
| |\ \ \
| | * \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-05-156-525/+195
| | |\ \ \
| | * | | | make llGetCameraPos and llGetCameraRot apply to avatar that granted permissio...UbitUmarov2012-05-141-4/+14
| * | | | | Fix an omissionMelanie2012-05-151-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-05-150-0/+0
| |\ \ \ \
| | * | | | Add another null check to Melanie's last commit. Seems to eliminate sqlite er...dahlia2012-05-141-1/+1
| * | | | | Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| |/ / / /
| * | | | Try to fix sqlite breakageMelanie2012-05-151-0/+3
| * | | | Port Avination's collision fixes to core.Melanie2012-05-155-523/+199
| | |_|/ | |/| |
* | | | Merge branch 'avination' into careminsterMelanie2012-05-146-525/+195
|\ \ \ \ | | |/ / | |/| |
| * | | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-145-523/+189
| * | | Check parcel entry permissions when moving objectsMelanie2012-05-141-1/+2
| * | | Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-05-1414-90/+344
|\ \ \ | | |/ | |/|
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-146-5/+100
| * | set executable bit for Ionic.Zip.dll for running OpenSimulator under cygwinJustin Clark-Casey (justincc)2012-05-141-0/+0
| * | minor: add explanative comment to 'missing baked texture' logging commonly se...Justin Clark-Casey (justincc)2012-05-141-0/+10
| * | minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| * | Set the agent in transit teleport flag at the first available opportunity (i....Justin Clark-Casey (justincc)2012-05-141-11/+37
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-145-67/+188
| |\ \
| | * | Oops - missed the config changesBlueWall2012-05-141-0/+8
| | * | Merge branch 'master' of /home/opensim/src/OpenSimBlueWall2012-05-133-29/+34
| | |\ \
| | | * | Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ...Chris Koeritz2012-05-133-29/+34
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-131-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Add configurable SpawnPointRoutingBlueWall2012-05-132-38/+146
| * | | | Add more region information to some teleport related loggingJustin Clark-Casey (justincc)2012-05-141-7/+8
| | |/ / | |/| |
* | | | Merge branch 'avination' into careminsterMelanie2012-05-1311-29/+129
|\ \ \ \ | | |_|/ | |/| |
| * | | ubitODE fix force in case of mlinear motor offset presentUbitUmarov2012-05-131-4/+5
| * | | display a sleep time of zero if forced spare time to zero, when sim fps is l...UbitUmarov2012-05-121-2/+7
| * | | ªTEST MESS* reduce animation packets send. Added onchangeanim event with par...UbitUmarov2012-05-127-3/+53
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-05-124-0/+96
| |\ \ \
| * | | | ubitODE let vehicles responde faster to changes of some parameters like motor...UbitUmarov2012-05-121-12/+13
| * | | | ubitODE reduced again a bit the max allowed correction velocity on colisions...UbitUmarov2012-05-121-1/+1
| * | | | ubitODE: trial workaround for avatar colisionsUbitUmarov2012-05-121-6/+49
| * | | | revert terminal vel reduction. It helped but not efectiveUbitUmarov2012-05-111-2/+2
* | | | | Merge branch 'avination' into careminsterMelanie2012-05-133-106/+163
|\ \ \ \ \ | | |/ / / | |/| | |