| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-20 | 8 | -19/+127 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'teravuswork' into avination | Melanie | 2012-11-20 | 10 | -79/+655 |
| |\ \ \ |
|
| | * | | | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 8 | -19/+127 |
| | * | | | Revert "Merge master into teravuswork", it should have been avination, not ma... | teravus | 2012-11-15 | 236 | -17948/+6954 |
| | * | | | Merge master into teravuswork | teravus | 2012-11-15 | 236 | -6954/+17948 |
| | |\ \ \ |
|
* | | \ \ \ | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster | Melanie | 2012-11-20 | 4 | -78/+546 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | * Fixes mesh loading issues in last commit. | teravus | 2012-11-15 | 1 | -0/+9 |
| * | | | | | * Prep work switching the GetMeshModule over to a poll service. | teravus | 2012-11-09 | 4 | -79/+538 |
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-19 | 6 | -352/+220 |
|\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| * | | | | | BulletSim: Use base class constructors for initialization of BSShape and othe... | Robert Adams | 2012-11-18 | 4 | -216/+214 |
| * | | | | | BulletSim: fix the problem with flying being disabled when crossing region bo... | Robert Adams | 2012-11-18 | 1 | -2/+6 |
| * | | | | | BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim... | Robert Adams | 2012-11-18 | 1 | -134/+0 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 13 | -49/+261 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Prevent a buffer overflow in asset receiving | Melanie | 2012-11-17 | 1 | -11/+20 |
| * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-11-06 | 3 | -20/+31 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | removed potencial null refs and rearrange code a bit | UbitUmarov | 2012-11-04 | 1 | -13/+19 |
| | * | | | actually remove the use of random on persist timmings | UbitUmarov | 2012-11-02 | 1 | -4/+6 |
| | * | | | Create a new random when needed using normal time based seed instead of | UbitUmarov | 2012-11-02 | 1 | -2/+5 |
| | * | | | add debug position on bad primmesh error | UbitUmarov | 2012-11-02 | 1 | -2/+2 |
| * | | | | This implements the Caps throttler. After some testing, the system seemed ... | teravus | 2012-11-05 | 1 | -13/+106 |
| * | | | | Another step in the chain. Pipe the throttle update to the appropriate PollS... | teravus | 2012-11-05 | 2 | -13/+40 |
| * | | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> Even... | teravus | 2012-11-04 | 8 | -3/+75 |
| * | | | | Prevent IMs being sent to prims when avies decline inventory offers from them. | Diva Canto | 2012-11-04 | 1 | -9/+12 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 36 | -1034/+1229 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Remove old InventoryService, which has for a long time been replaced by XInve... | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -782/+0 |
| * | | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid | Justin Clark-Casey (justincc) | 2012-11-17 | 5 | -27/+9 |
| * | | | | Do not allow invariants to change on calls to XInventoryService.UpdateItem() | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -10/+140 |
| * | | | | Add basic XInventoryServicesTests.TestAddItem() regression test. | Justin Clark-Casey (justincc) | 2012-11-17 | 1 | -0/+87 |
| * | | | | refactor: Move stat classes out of StatManager and into their own files for c... | Justin Clark-Casey (justincc) | 2012-11-16 | 3 | -260/+326 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-11-16 | 20 | -0/+660 |
| |\ \ \ \ |
|
| | * | | | | The last few AssemblyInfos. Finished! | Diva Canto | 2012-11-14 | 20 | -0/+660 |
| * | | | | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ... | Justin Clark-Casey (justincc) | 2012-11-16 | 3 | -4/+140 |
| |/ / / / |
|
| * | | | | refactor: move common inventory folder version update code to parent class in... | Justin Clark-Casey (justincc) | 2012-11-15 | 3 | -112/+28 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 9 | -141/+468 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Improve inventory folder version updating for mssql database plugin. | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -14/+102 |
| * | | | | Implement folder version updating for the sqlite inventory plugin | Justin Clark-Casey (justincc) | 2012-11-15 | 2 | -7/+142 |
| * | | | | Handle Map block requests on a separate thread rather than the main packet ha... | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -1/+1 |
| * | | | | Do HandleMapLayerRequest on its own thread rather than on the main inbound ud... | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -1/+1 |
| * | | | | Following on from 4f982596, launch map name requests on an async thread from ... | Justin Clark-Casey (justincc) | 2012-11-15 | 2 | -13/+9 |
| * | | | | Make PacketPool class stats pull stats instead of push stats so they can be l... | Justin Clark-Casey (justincc) | 2012-11-15 | 4 | -67/+117 |
| * | | | | Add IncomingPacketsProcessedCount stat for diagnostics. | Justin Clark-Casey (justincc) | 2012-11-15 | 2 | -38/+96 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 69 | -349/+1453 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Added AssemblyInfos in the OpenSim.Server namespace dlls. | Diva Canto | 2012-11-14 | 2 | -0/+66 |
| * | | | | Added AssemblyInfos to every dll in the OpenSim.Region namespace. | Diva Canto | 2012-11-14 | 20 | -4/+532 |
| * | | | | A few more AssemblyInfos in a few more dlls. | Diva Canto | 2012-11-14 | 12 | -4/+334 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-14 | 10 | -298/+319 |
| |\ \ \ \ |
|
| | * | | | | More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possi... | Justin Clark-Casey (justincc) | 2012-11-14 | 9 | -298/+305 |
| | * | | | | If no ISimulationDataStore or IEstateDataStore implementations could be loade... | Justin Clark-Casey (justincc) | 2012-11-14 | 1 | -0/+14 |
| * | | | | | Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ser... | Diva Canto | 2012-11-14 | 1 | -4/+2 |
| |/ / / / |
|
| * | | | | Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which... | Diva Canto | 2012-11-13 | 5 | -0/+169 |