aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-11-208-19/+127
|\
| * Merge branch 'teravuswork' into avinationMelanie2012-11-2011-82/+668
| |\
| | * * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-178-19/+127
* | | Merge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminsterMelanie2012-11-200-0/+0
|\ \ \ | | |/ | |/|
| * | Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-15337-30953/+13136
| * | Merge master into teravusworkteravus2012-11-15336-13123/+30950
| |\ \
* | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-204-78/+546
|\ \ \ \ | |/ / /
| * | | * Fixes mesh loading issues in last commit.teravus2012-11-151-0/+9
| * | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-094-79/+538
* | | | Merge branch 'master' into careminsterMelanie2012-11-1910-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-185-134/+0
* | | | | Merge branch 'avination' into careminsterMelanie2012-11-1713-49/+261
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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-052-13/+40
| * | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> Even...teravus2012-11-048-3/+75
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1738-1035/+1285
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Remove old InventoryService, which has for a long time been replaced by XInve...Justin Clark-Casey (justincc)2012-11-172-782/+0
| * | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-175-27/+9
| * | | | Do not allow invariants to change on calls to XInventoryService.UpdateItem()Justin Clark-Casey (justincc)2012-11-172-10/+140
| * | | | Add basic XInventoryServicesTests.TestAddItem() regression test.Justin Clark-Casey (justincc)2012-11-173-1/+143
| * | | | refactor: Move stat classes out of StatManager and into their own files for c...Justin Clark-Casey (justincc)2012-11-163-260/+326
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-1620-0/+660
| |\ \ \ \
| | * | | | The last few AssemblyInfos. Finished!Diva Canto2012-11-1420-0/+660
| * | | | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ...Justin Clark-Casey (justincc)2012-11-163-4/+140
| |/ / / /
| * | | | refactor: move common inventory folder version update code to parent class in...Justin Clark-Casey (justincc)2012-11-153-112/+28
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1510-143/+471
|\ \ \ \ \ | |/ / / /
| * | | | Improve inventory folder version updating for mssql database plugin.Justin Clark-Casey (justincc)2012-11-151-14/+102
| * | | | Fix build break from 1aa0271 by adding System.Core to prebuild.xmlJustin Clark-Casey (justincc)2012-11-151-2/+3
| * | | | Implement folder version updating for the sqlite inventory pluginJustin Clark-Casey (justincc)2012-11-152-7/+142
| * | | | 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-154-67/+117
| * | | | Add IncomingPacketsProcessedCount stat for diagnostics.Justin Clark-Casey (justincc)2012-11-152-38/+96
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1573-393/+1454
|\ \ \ \ \ | |/ / / /
| * | | | Added AssemblyInfos in the OpenSim.Server namespace dlls.Diva Canto2012-11-142-0/+66
| * | | | Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-1420-4/+532
| * | | | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-1412-4/+334
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-1410-298/+319
| |\ \ \ \
| | * | | | More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possi...Justin Clark-Casey (justincc)2012-11-149-298/+305
| | * | | | If no ISimulationDataStore or IEstateDataStore implementations could be loade...Justin Clark-Casey (justincc)2012-11-141-0/+14
| * | | | | Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ser...Diva Canto2012-11-141-4/+2
| |/ / / /