aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-2212-321/+713
|\
| * BulletSim: Make avatar capsule so it is not circular.Robert Adams2012-11-216-21/+39
| * BulletSim: Properly position mesh terrain on creation (fixes terrain not appe...Robert Adams2012-11-212-76/+44
| * BulletSim: add terrainImplementation parameter with default to Mesh.Robert Adams2012-11-213-5/+46
| * BulletSim: fix line endings to be all Linux style (windows style keeps creepi...Robert Adams2012-11-212-454/+454
| * BulletSim: enablement and debugging of mesh terrain.Robert Adams2012-11-214-36/+253
| * BulletSim: pull heightmap implementation out of the terrain manager so a mesh...Robert Adams2012-11-214-181/+327
| * BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually ha...Robert Adams2012-11-214-8/+8
| * BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is gett...Robert Adams2012-11-213-20/+22
| * BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is g...Robert Adams2012-11-219-66/+67
| * BulletSim: change PositionSanityCheck to apply a force to correct position co...Robert Adams2012-11-212-33/+30
| * BulletSim: tweek avatar capsule parameters so avatar feet don't go below grou...Robert Adams2012-11-212-8/+10
* | Merge branch 'master' into careminsterMelanie2012-11-205-196/+169
|\ \ | |/
| * If GetAgents() is called with an empty userIDs array then don't bother with a...Justin Clark-Casey (justincc)2012-11-201-0/+4
| * refactor: Move common presence connector code into BasePresenceServiceConnectorJustin Clark-Casey (justincc)2012-11-204-193/+145
| * Minor formatting for 0962a35d and a few one-line comments as to why that code...Justin Clark-Casey (justincc)2012-11-201-8/+7
| * Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
* | Merge branch 'avination' into careminsterMelanie2012-11-205-18/+99
|\ \
| * \ Merge branch 'teravuswork' into avinationMelanie2012-11-206-73/+491
| |\ \
| | * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-175-18/+99
| | * | Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-15159-15158/+6023
| | * | Merge master into teravusworkteravus2012-11-15159-6023/+15158
| | |\ \
* | | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-202-72/+409
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-092-73/+410
* | | | | Merge branch 'master' into careminsterMelanie2012-11-196-352/+220
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | BulletSim: Use base class constructors for initialization of BSShape and othe...Robert Adams2012-11-184-216/+214
| * | | | BulletSim: fix the problem with flying being disabled when crossing region bo...Robert Adams2012-11-181-2/+6
| * | | | BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim...Robert Adams2012-11-181-134/+0
* | | | | Merge branch 'avination' into careminsterMelanie2012-11-1710-46/+254
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Prevent a buffer overflow in asset receivingMelanie2012-11-171-11/+20
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-11-063-20/+31
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | removed potencial null refs and rearrange code a bitUbitUmarov2012-11-041-13/+19
| | * | | actually remove the use of random on persist timmingsUbitUmarov2012-11-021-4/+6
| | * | | Create a new random when needed using normal time based seed instead ofUbitUmarov2012-11-021-2/+5
| | * | | add debug position on bad primmesh errorUbitUmarov2012-11-021-2/+2
| * | | | This implements the Caps throttler. After some testing, the system seemed ...teravus2012-11-051-13/+106
| * | | | Another step in the chain. Pipe the throttle update to the appropriate PollS...teravus2012-11-051-12/+35
| * | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> Even...teravus2012-11-046-1/+73
| * | | | Prevent IMs being sent to prims when avies decline inventory offers from them.Diva Canto2012-11-041-9/+12
* | | | | Merge branch 'master' into careminsterMelanie2012-11-173-5/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-172-5/+4
| * | | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ...Justin Clark-Casey (justincc)2012-11-161-0/+1
* | | | | Merge branch 'master' into careminsterMelanie2012-11-155-116/+214
|\ \ \ \ \ | |/ / / /
| * | | | Handle Map block requests on a separate thread rather than the main packet ha...Justin Clark-Casey (justincc)2012-11-151-1/+1
| * | | | Do HandleMapLayerRequest on its own thread rather than on the main inbound ud...Justin Clark-Casey (justincc)2012-11-151-1/+1
| * | | | Following on from 4f982596, launch map name requests on an async thread from ...Justin Clark-Casey (justincc)2012-11-152-13/+9
| * | | | Make PacketPool class stats pull stats instead of push stats so they can be l...Justin Clark-Casey (justincc)2012-11-153-63/+107
| * | | | Add IncomingPacketsProcessedCount stat for diagnostics.Justin Clark-Casey (justincc)2012-11-152-38/+96
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1535-37/+606
|\ \ \ \ \ | |/ / / /
| * | | | Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-1420-4/+532