| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | 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 | 10 | -143/+471 | |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | 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. | |||||
| | | * | | | | Fix build break from 1aa0271 by adding System.Core to prebuild.xml | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -2/+3 | |
| | | | | | | | ||||||
| | | * | | | | 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 | 73 | -393/+1454 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | 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.) | |||||
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-13 | 3 | -43/+0 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Replace old Prebuild.exe accidentally added back in f977291 with one built ↵ | Justin Clark-Casey (justincc) | 2012-11-14 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without <copy> nant target generation and on mono 2.4.3 | |||||
| | | | * | | | | Replace previously updated Prebuild.exe with one built directly with mono 2.4.3 | Justin Clark-Casey (justincc) | 2012-11-14 | 1 | -0/+0 | |
| | | | | | | | | ||||||
| | | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-11-14 | 82 | -122/+195 | |
| | | | |\ \ \ \ | ||||||
| | | | * | | | | | Stop Prebuild from generating <copy> statements which unnecessarily copy ↵ | Justin Clark-Casey (justincc) | 2012-11-14 | 3 | -43/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files into bin/Debug or bin/Release nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39). Which makes nant time-consumingly copy these files when the aren't actually used. Tested removal of <copy> on both nant 0.91 and nant 0.92 Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention. | |||||
| | | * | | | | | | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵ | Diva Canto | 2012-11-13 | 16 | -17/+17 | |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | ||||||
| | | * | | | | | Last 27 modules' directives (service connectors out). | Diva Canto | 2012-11-13 | 27 | -33/+54 | |
| | | | | | | | | ||||||
| | | * | | | | | Another 11 modules' directions moved out of .addin.xml | Diva Canto | 2012-11-13 | 12 | -14/+22 | |
| | | | | | | | | ||||||
| | | * | | | | | Another 21 modules' directives moved out of .addin.xml | Diva Canto | 2012-11-13 | 21 | -22/+41 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 16 | -82/+99 | |
| | |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | | Moved the WindModule and its own plugins out of .addin.xml | Diva Canto | 2012-11-12 | 4 | -5/+5 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-12 | 2 | -67/+74 | |
| | | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | | * | | | | minor: Add some explanative method doc to SceneHelpers.SetupSceneModules() | Justin Clark-Casey (justincc) | 2012-11-13 | 1 | -0/+4 | |
| | | | | | | | | ||||||
| | | | * | | | | Disable code to get server-side to move given items to a destination folder ↵ | Justin Clark-Casey (justincc) | 2012-11-13 | 1 | -67/+70 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on TaskInventoryAccepted. This is because the fixes to inventory versioning (so that they better match viewer expections) now appear to allow the viewer to execute #RLV moves, as happens on the LL grid. Doing it again server-side now wrongly creates another child #RLV folder underneath the root one. As per http://opensimulator.org/mantis/view.php?id=6311 | |||||
| | | * | | | | | Another 10 modules' directives moved from .addin.xml | Diva Canto | 2012-11-12 | 11 | -10/+20 | |
| | | |/ / / / | ||||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 7 | -6/+12 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | More module cleanup: removed the CoreModules.Framework modules directives ↵ | Diva Canto | 2012-11-12 | 7 | -6/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | out of .addin.xml. | |||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 43 | -45/+42 | |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | |||||
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-12 | 1 | -1/+1 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 44 | -44/+44 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | | Update ScriptModuleComms name space to CoreModules | Melanie | 2012-11-13 | 1 | -1/+1 | |
| | | |/ / / / | ||||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 42 | -572/+85 | |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |