aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-05-176-10/+332
|\
| * udp transfer: make number packets estimation coerent with number actually sen...UbitUmarov2012-05-171-2/+8
| * trigger collision sounds on active agent position for better spatial effect ...UbitUmarov2012-05-172-23/+22
| * increase avatars collisions report to 10 per sec, Stopped sound on avatar to ...UbitUmarov2012-05-172-2/+2
| * add avatar colision sounds. Changed test sound UUIDUbitUmarov2012-05-172-62/+120
| * default colisionVolume is 0, use it only for user specified soundUbitUmarov2012-05-171-3/+6
| * default collision sounds. Incomplete, untested, needs revisionUbitUmarov2012-05-172-1/+205
| * collision sounds: simplify send code a bit and limit sending rate to 5 per s...UbitUmarov2012-05-161-1/+36
| * Added a invalidCollisionSoundUUID so that scripts can stop all collision sou...UbitUmarov2012-05-163-6/+23
* | Merge branch 'master' into careminsterMelanie2012-05-176-44/+198
|\ \
| * \ Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-05-171-29/+28
| |\ \
| | * | Force the default Telehub router if no matches are found in the config.BlueWall2012-05-171-29/+28
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-161-0/+67
| |\ \ \
| | * | | minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFai...Justin Clark-Casey (justincc)2012-05-171-1/+1
| | * | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()Justin Clark-Casey (justincc)2012-05-171-0/+67
| | |/ /
| * | | Fix boo-boo in OpenSim.ini.example affecting telehub sequential routingBlueWall2012-05-161-2/+2
| |/ /
| * | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression te...Justin Clark-Casey (justincc)2012-05-172-2/+8
| * | minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator bec...Justin Clark-Casey (justincc)2012-05-171-8/+6
| * | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()Justin Clark-Casey (justincc)2012-05-172-1/+77
| * | Remove redundant "Teleport failed:" from reason when QueryAccess fails for th...Justin Clark-Casey (justincc)2012-05-171-4/+12
* | | 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