aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-172-1/+72
|\
| * Documentation of IScriptModuleComms.RegisterConstant and IScriptModuleComms.L...SignpostMarv2012-09-171-1/+18
| * Implementing ability to register script constants and invocations on a region...SignpostMarv2012-09-172-0/+54
* | Merge branch 'master' into careminsterMelanie2012-09-173-40/+71
|\ \ | |/
| * preventing a null reference exception from being thrownSignpostMarv2012-09-171-0/+3
| * script invocations cannot have void return typeSignpostMarv2012-09-171-9/+9
| * HG2.0: Generalized the allowed HG appearances to be more than 1.Diva Canto2012-09-161-31/+59
* | Merge branch 'avination' into careminsterMelanie2012-09-168-434/+406
|\ \
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-141-44/+179
| * | Allow some more connections to try to ease lag.Melanie2012-09-142-2/+4
| * | Wait longer for arrival cofirmation to aid tps into laggy regionsMelanie2012-09-141-2/+2
| * | Wait a bit longer for new scene presences to aid tps into laggy regionsMelanie2012-09-141-1/+1
| * | Add a logger so the prior commit will workMelanie2012-09-121-0/+3
| * | Stop expiry timer when upload is complete. Log if timeout is reached.Melanie2012-09-121-0/+2
| * | Add a timer to time out upload caps handlers that are not used.Melanie2012-09-121-0/+12
| * | Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| * | report mesh upload costs ( fake values)UbitUmarov2012-09-111-2/+46
| * | let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-0/+1
| * | Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| * | Re-add the module and fix a typoMelanie2012-09-111-0/+332
| * | Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePriceMelanie2012-09-111-332/+0
| * | Add cost calculation suppor tto the VariablePrice one as wellMelanie2012-09-112-9/+44
| * | Revert "Remove the unused NewFileAgentInventoryVariablePrice module."Melanie2012-09-111-0/+296
| * | Add the option to have variable costing for uploadsMelanie2012-09-112-9/+46
| * | Remove the unused NewFileAgentInventoryVariablePrice module.Melanie2012-09-111-296/+0
| * | Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-81/+117
* | | Merge branch 'master' into careminsterMelanie2012-09-1636-1294/+2619
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-1527-1231/+2289
| |\ \
| | * | BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-151-1/+1
| | * | BulletSim: some debugging prints in BSPrim for tracking changes in linkset ch...Robert Adams2012-09-151-1/+3
| | * | BulletSim: add the debugging routine DumpRigidBody2() to API2.Robert Adams2012-09-151-3/+6
| | * | BulletSim: another attempt at computing physics FPS correctly.Robert Adams2012-09-151-23/+6
| | * | BulletSim: remove timeStep parameter from calls for vehicle parameter setting...Robert Adams2012-09-152-9/+6
| | * | BulletSim: Remove calculation and passing of unused collied object type.Robert Adams2012-09-154-28/+36
| | * | BulletSim: set all linkset objects center of mass to the whole linkset's cent...Robert Adams2012-09-151-2/+15
| | * | BulletSim: Add calls to linkset class when object going static or dynamic.Robert Adams2012-09-152-8/+32
| | * | BulletSim: remove unused NeedsMeshing() code from BSScene.Robert Adams2012-09-151-116/+0
| | * | BulletSim: Add 'IsNativeShape2' callRobert Adams2012-09-151-4/+7
| | * | BulletSim: Way too many changes in one commit.Robert Adams2012-09-159-286/+351
| | * | Add basic asset connector tests to check behaviour for normal, local and temp...Justin Clark-Casey (justincc)2012-09-152-2/+141
| | * | For FlotsamAssetCache, always update access times of cached scene assets befo...Justin Clark-Casey (justincc)2012-09-151-20/+17
| | * | Added unit tests for multi-region OARsOren Hurvitz2012-09-143-60/+332
| | * | Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ...Justin Clark-Casey (justincc)2012-09-143-9/+9
| | * | Support multi-region OAR filesOren Hurvitz2012-09-1412-400/+1068
| * | | More on HG2.0: added the possibility of controlling the appearance that avies...Diva Canto2012-09-152-2/+171
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-132-1/+45
| |\ \
| | * | Documentation of parcel-related eventsSignpostMarv2012-09-131-0/+44
| | * | correcting a typo that causes c# express to complain about xml comment contai...SignpostMarv2012-09-131-1/+1
| * | | Restarting to work on HGSuitcaseInventoryService: added the ability for the o...Diva Canto2012-09-131-0/+2
| |/ /
| * | minor: Comment out friends notification log spam for now.Justin Clark-Casey (justincc)2012-09-121-3/+3