aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-2334-950/+952
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-2337-957/+961
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-221-29/+35
| | |\
| | | * BulletSim: move new linear deflection code to own routine.Robert Adams2013-06-211-29/+35
| | * | Change IsLocalRegion from using region handle to using regionID. This was aff...Diva Canto2013-06-223-7/+6
| | * | HG: avoid call on localhost between sim and UAS for standalone.Diva Canto2013-06-221-1/+20
| | * | Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-2111-365/+171
| | |/
| | * BulletSim: Implementation of Linear Deflection, it is a partial help for the ...Vegaslon2013-06-201-5/+33
| | * BulletSim: rework velocity updating when not colliding and not flyingRobert Adams2013-06-202-5/+42
| | * minor: remove mono compiler warnings in WebsocketServerHandler.csJustin Clark-Casey (justincc)2013-06-201-13/+7
| | * Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. A...Justin Clark-Casey (justincc)2013-06-201-3/+3
| | * Allow more than one stat category to be specified in "show stats"Justin Clark-Casey (justincc)2013-06-201-30/+34
| | * minor: Change "memory churn" terminology in statistics to "heap allocation ra...Justin Clark-Casey (justincc)2013-06-203-14/+14
| | * Fix minor bug where the check whether to display SmartThreadPool stats was ac...Justin Clark-Casey (justincc)2013-06-201-1/+1
| | * minor: fix mono compiler warning in FetchInventory2HandlerJustin Clark-Casey (justincc)2013-06-201-2/+2
| | * Make it possible to specify display of stats in a particular 'container' by s...Justin Clark-Casey (justincc)2013-06-202-3/+17
| | * Display existing statistic of how many http requests a server is making as se...Justin Clark-Casey (justincc)2013-06-193-5/+23
| | * Mantis 6608: Math error in parcel dimensions/borders seen with land show commandTalun2013-06-191-10/+10
| | * minor: remove mono compiler warning in OfflineIMServiceJustin Clark-Casey (justincc)2013-06-181-1/+1
| | * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
| | * minor: tidy up spacing if display a unit for additional stat informationJustin Clark-Casey (justincc)2013-06-181-1/+1
| | * Make number of inbound http requests handled available as a httpserver.<port>...Justin Clark-Casey (justincc)2013-06-183-6/+35
| | * Fix issue where stat samples were accidentally static, so that any additional...Justin Clark-Casey (justincc)2013-06-181-1/+1
| | * Fix other places when saving scripts or notecards in prim inventories where m...Justin Clark-Casey (justincc)2013-06-181-5/+5
| | * If SmartThreadPool is active, display statistical information about it in "sh...Justin Clark-Casey (justincc)2013-06-181-2/+13
| | * refactor: Move existing code to generate report information on the threadpool...Justin Clark-Casey (justincc)2013-06-172-64/+103
| | * Fix bug where no threadpool data would be displayed in the "show threads" com...Justin Clark-Casey (justincc)2013-06-171-1/+1
| | * minor: remove mono compiler warnings in WebFetchInvDescModuleJustin Clark-Casey (justincc)2013-06-171-3/+2
| | * Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9Justin Clark-Casey (justincc)2013-06-171-2/+2
| | * Drop server level stats to debug instead of info.Justin Clark-Casey (justincc)2013-06-171-1/+1
| | * Add server stats for available builtin threadpool and iocp workersJustin Clark-Casey (justincc)2013-06-171-0/+16
| | * Make general server stats available on the robust console as well as the simu...Justin Clark-Casey (justincc)2013-06-179-421/+403
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-234-7/+14
|\ \ \
| * | | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| * | | Allow coalesced objects to be rezzed even if they extend past the sim boundsMelanie2013-06-181-2/+6
| * | | Forward the reason to the scriptMelanie2013-06-131-1/+1
| * | | Add a result param to te money module interfaceMelanie2013-06-133-4/+7
| * | | * This fixes having to select and deselect prim to get keyframemotion to star...Melanie2013-06-133-2/+8
* | | | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-06-189-61/+191
|\ \ \ | |/ /
| * | correct method doc for llRot2Axis()dahlia2013-06-141-1/+1
| * | Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfi...Justin Clark-Casey (justincc)2013-06-151-14/+13
| * | Correct build break in previous commit 9c530d7Justin Clark-Casey (justincc)2013-06-151-10/+7
| * | refactor: In UserProfileModule, change classifiedCache and classifiedInterest...Justin Clark-Casey (justincc)2013-06-151-19/+23
| * | Add the standard OpenSimulator copyright notice to the top of InventoryCache.csJustin Clark-Casey (justincc)2013-06-151-1/+28
| * | Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache i...Justin Clark-Casey (justincc)2013-06-151-14/+23
| * | minor: remove mono compiler warnings from LSL_Api, properly format method doc...Justin Clark-Casey (justincc)2013-06-151-7/+5
| * | Mantis 6280: llSetContentType(). An implementation.Talun2013-06-154-0/+84
| * | Mantis 6108: ossetprimitiveparams temporary/phantom problemTalun2013-06-151-2/+2