aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-1910-121/+366
|\
| * Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ...Justin Clark-Casey (justincc)2012-05-193-20/+5
| * Add some method doc to RegionCombinerModule. Clean up log messages.Justin Clark-Casey (justincc)2012-05-191-10/+29
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-192-8/+6
| |\
| | * Further refinement on propertiesBlueWall2012-05-181-7/+4
| | * Cleanup + change properties to set fields with private set : Thanks Justin fo...BlueWall2012-05-182-3/+4
| * | Add is_megaregion flag into oar control file. Not currently read - for futur...Justin Clark-Casey (justincc)2012-05-194-43/+145
| |/
| * Provide Telehub setting to allow use of landmarksBlueWall2012-05-182-1/+9
| * Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| * Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| * refactor: move EventQueueGet path generation into common method. Rename some...Justin Clark-Casey (justincc)2012-05-182-21/+34
| * Don't eagerly clear frame collision events when physics actors subscribe and ...Justin Clark-Casey (justincc)2012-05-171-2/+8
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-171-29/+28
| |\
| * | Check agent limit against root agent count rather than both root and child ag...Justin Clark-Casey (justincc)2012-05-173-22/+43
* | | 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-174-41/+189
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| * | | 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
| |/ /
| * | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression te...Justin Clark-Casey (justincc)2012-05-171-2/+2
| * | 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-171-0/+76
| * | 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-166-215/+278
|\ \ \ | |/ /
| * | 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-154-522/+202
| |\ \
| * | | Fix issue where loading OARs could sometimes result in link numbers being reo...Justin Clark-Casey (justincc)2012-05-153-2/+68
| * | | Allow use of regular expressions in "show object name", "show part name" and ...Justin Clark-Casey (justincc)2012-05-151-101/+208
* | | | Merge branch 'avination' into careminsterMelanie2012-05-154-63/+196
|\ \ \ \ | | |_|/ | |/| |
| * | | 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-151-0/+3
| * | | 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-155-524/+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
|\ \ \ \ \ | | |_|_|/ | |/| | |