| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster | Melanie | 2012-11-20 | 4 | -78/+546 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||||
| | * | | | | * 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 | |
| | | | | | | | | | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet. | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-19 | 6 | -352/+220 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | | BulletSim: Use base class constructors for initialization of BSShape and ↵ | Robert Adams | 2012-11-18 | 4 | -216/+214 | |
| | | | | | | | | | | | | | | | | | | | | | other classes. | |||||
| | * | | | | BulletSim: fix the problem with flying being disabled when crossing region ↵ | Robert Adams | 2012-11-18 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | | boundries. | |||||
| | * | | | | BulletSim: remove the obsolete interface to the Bullet code. Update ↵ | Robert Adams | 2012-11-18 | 1 | -134/+0 | |
| | | | | | | | | | | | | | | | | | | | | | BulletSim libraries with code stripped of the obsolete code. | |||||
| * | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | reusing a shared one than may not be valid | |||||
| | | * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference. Tested with Two Clients on a region with 1800 textures all visible at once. | |||||
| | * | | | | Another step in the chain. Pipe the throttle update to the appropriate ↵ | teravus | 2012-11-05 | 2 | -13/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator. Next step is hooking it up to HasEvents | |||||
| | * | | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 8 | -3/+75 | |
| | | | | | | | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | |||||
| | * | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -782/+0 | |
| | | | | | | | | | | | | | | | | | | | | | XInventoryService. | |||||
| | * | | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid | Justin Clark-Casey (justincc) | 2012-11-17 | 5 | -27/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId | |||||
| | * | | | | Do not allow invariants to change on calls to XInventoryService.UpdateItem() | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -10/+140 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help track down http://opensimulator.org/mantis/view.php?id=6359 where creator IDs on items and rezzed objects have been reported to sometimes change. This should never happen - a particular item should never change creators (if an item is given then a new item (with new id) is created). Invariants are inventory type, asset type, folder (changed only on MoveItems()), CreatorIdentification and Owner. If caller attempts to change an invariant, warning is logged but other properties are still changed. If you see this warning, reporting on Mantis 6359 would be very welcome with the exact operation being done at the time. | |||||
| | * | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-11-16 | 3 | -260/+326 | |
| | | | | | | | | | | | | | | | | | | | | | clarity. | |||||
| | * | | | | 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 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | delta over time. The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling. | |||||
| | * | | | | refactor: move common inventory folder version update code to parent class ↵ | Justin Clark-Casey (justincc) | 2012-11-15 | 3 | -112/+28 | |
| | | | | | | | | | | | | | | | | | | | | | in mysql, mssql and sqlite database plugins | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 9 | -141/+468 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||||
| | * | | | | Improve inventory folder version updating for mssql database plugin. | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -14/+102 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | I am not in a position to test this so the updates have been done blind. If it needs any fixing will probably require patches. | |||||
| | * | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling thread. This prevents a slow grid information network call from holding up the main packet handling thread. There's no obvious race condition reason for not doing this asynchronously. | |||||
| | * | | | | Do HandleMapLayerRequest on its own thread rather than on the main inbound ↵ | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | udp packet handling thread. There's no obvious race condition reason for doing this on the main packet handling thread. | |||||
| | * | | | | Following on from 4f982596, launch map name requests on an async thread from ↵ | Justin Clark-Casey (justincc) | 2012-11-15 | 2 | -13/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLClientView directly. This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling | |||||
| | * | | | | Make PacketPool class stats pull stats instead of push stats so they can be ↵ | Justin Clark-Casey (justincc) | 2012-11-15 | 4 | -67/+117 | |
| | | | | | | | | | | | | | | | | | | | | | lifted up into LLUDPServer and be distiguished by scene name | |||||
| | * | | | | Add IncomingPacketsProcessedCount stat for diagnostics. | Justin Clark-Casey (justincc) | 2012-11-15 | 2 | -38/+96 | |
| | | | | | | | | | | | | | | | | | | | | | Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene. | |||||
| * | | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-11-14 | 9 | -298/+305 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible. Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future. | |||||
| | | * | | | | If no ISimulationDataStore or IEstateDataStore implementations could be ↵ | Justin Clark-Casey (justincc) | 2012-11-14 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loaded then halt with informative message rather than a later NRE. Halt already occurs if the relevant config sections are not present. So it also makes sense to halt if the implementations themselves cannot be loaded. | |||||
| | * | | | | | Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ↵ | Diva Canto | 2012-11-14 | 1 | -4/+2 | |
| | |/ / / / | | | | | | | | | | | | | | | | service) | |||||
| | * | | | | Added a few more AssemblyInfos. (Plus added the one in OptionalModules, ↵ | Diva Canto | 2012-11-13 | 5 | -0/+169 | |
| | | | | | | | | | | | | | | | | | | | | | which had been forgotten.) | |||||
| | * | | | | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵ | Diva Canto | 2012-11-13 | 15 | -16/+16 | |
| | | | | | | | | | | | | | | | | | | | | | have an AssemblyInfo file. | |||||
| | * | | | | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. | Diva Canto | 2012-11-13 | 2 | -15/+0 | |
| | | | | | | ||||||
| | * | | | | All optional modules' directives moved out of addin.xml | Diva Canto | 2012-11-13 | 9 | -8/+15 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 59 | -84/+158 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||||
| | * | | | | Deleted .addin.xml. Added AssemblyInfo.cs | Diva Canto | 2012-11-13 | 2 | -15/+38 | |
| | | | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |