aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-138-35/+189
|\
| * Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in...Justin Clark-Casey (justincc)2013-07-131-8/+12
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-135-10/+134
| |\
| | * Add ToOSDMap() overrides to the Stat subclass CounterStat.Robert Adams2013-07-123-0/+88
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-128-106/+313
| | |\
| | * | Changed UploadBakedTextureModule so that it uses the same pattern as the othe...Diva Canto2013-07-121-8/+27
| | * | Added a few more thingies to the asset client test to poke the threadpool.Diva Canto2013-07-111-2/+19
| * | | In co-op termination, extend EventWaitHandle to give this an indefinite lifet...Justin Clark-Casey (justincc)2013-07-131-2/+21
| | |/ | |/|
| * | Enhance NullEstateData to remember stored estate values and returnRobert Adams2013-07-111-7/+21
* | | Merge branch 'master' into careminsterMelanie2013-07-13107-946/+2110
|\ \ \ | |/ /
| * | Centralize duplicated code in SceneObjectPart for subscribing toRobert Adams2013-07-111-54/+43
| * | Try naming the materials handlers again, this time registering the POST as Re...Justin Clark-Casey (justincc)2013-07-111-3/+6
| * | minor: remove some regression test logging switches accidentally left uncomme...Justin Clark-Casey (justincc)2013-07-112-2/+2
| * | minor: Take out unnecessary clumsy sleep at the end of regression Test404Resp...Justin Clark-Casey (justincc)2013-07-111-3/+0
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-114-7/+136
| |\ \ | | |/
| | * Added property to make for more flexible testing.Diva Canto2013-07-111-0/+5
| | * Added a test for the asset serviceDiva Canto2013-07-112-0/+126
| | * Changed the UserProfileModule so that it's less greedy in terms of thread usage.Diva Canto2013-07-111-7/+5
| * | Fix regression where llHTTPRequests which did not get an OK response returned...Justin Clark-Casey (justincc)2013-07-114-41/+245
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-111-7/+4
| |\
| | * remove names from Capability handlers (added by justincc in commit 013710168b...dahlia2013-07-101-7/+4
| * | Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they ar...Diva Canto2013-07-111-2/+2
| * | Switched TransferRequest (UDP packet handler) to sync. The permissions checks...Diva Canto2013-07-111-99/+115
| |/
| * Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.Diva Canto2013-07-101-1/+1
| * EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. T...Diva Canto2013-07-101-1/+1
| * show client stats: Fixed the requests/min. Also changed the spelling of the c...Diva Canto2013-07-101-21/+22
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-101-4/+8
| |\
| | * Remove a null reference exception in SimianPresenceServiceConnector thatRobert Adams2013-07-101-4/+8
| * | Added show client-stats [first last] command to expose what viewers are reque...Diva Canto2013-07-104-20/+145
| |/
| * Comment out old inbound UDP throttling hack. This would cause the UDPRobert Adams2013-07-091-0/+2
| * Revert "minor: remove some mono compiler warnings in UserProfileModule"Robert Adams2013-07-091-13/+16
| * If a sensor is in an attachment, avoid throwing an exception if the attachee ...Justin Clark-Casey (justincc)2013-07-091-0/+10
| * Handle UUIDNameRequest UDP packet processing async instead of within the main...Justin Clark-Casey (justincc)2013-07-091-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-0962-341/+709
| |\
| | * BulletSim: add parameter to optionally disable vehicle linear deflection.Robert Adams2013-07-092-16/+34
| | * remove some cruft and trigger a rebuilddahlia2013-07-081-1/+0
| | * remove an invalid null UUID check which caused a warningdahlia2013-07-081-8/+1
| | * BulletSim: make all the different angularVerticalAttraction algorithmsRobert Adams2013-07-084-138/+146
| | * minor: remove mono compiler warnings from HGSuitcaseInventoryServiceJustin Clark-Casey (justincc)2013-07-091-3/+3
| | * minor: remove some mono compiler warnings in UserProfileModuleJustin Clark-Casey (justincc)2013-07-091-16/+13
| | * minor: remove some mono compiler warnings in new groups codeJustin Clark-Casey (justincc)2013-07-084-8/+1
| | * minor: remove mono compiler warnings related to keyframe codeJustin Clark-Casey (justincc)2013-07-082-8/+3
| | * Add missing file BaseOutputStreamHandler.cs from recent commit e19defdJustin Clark-Casey (justincc)2013-07-081-0/+60
| | * minor: remove some mono compiler warnings in OdePluginJustin Clark-Casey (justincc)2013-07-082-2/+1
| | * minor: remove now unused migration-hack bool from DAMapJustin Clark-Casey (justincc)2013-07-081-4/+0
| | * minor: Add back commented out logging message in Caps.RegisterHandler() that ...Justin Clark-Casey (justincc)2013-07-081-0/+1
| | * For stat purposes, add names to capability request handlers where these were ...Justin Clark-Casey (justincc)2013-07-085-11/+20
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| | |\
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-0827-359/+477
| | |\ \
| | * | | Add "show caps stats by user" and "show caps stats by cap" console commands t...Justin Clark-Casey (justincc)2013-07-0843-80/+346