aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ↵Justin Clark-Casey (justincc)2012-11-163-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-153-112/+28
| | | | | | | | | | | | | | | | | | | | in mysql, mssql and sqlite database plugins
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1510-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-151-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.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 ↵Justin Clark-Casey (justincc)2012-11-151-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-151-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-152-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-154-67/+117
| | | | | | | | | | | | | | | | | | | | lifted up into LLUDPServer and be distiguished by scene name
| * | | | Add IncomingPacketsProcessedCount stat for diagnostics.Justin Clark-Casey (justincc)2012-11-152-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 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 ↵Justin Clark-Casey (justincc)2012-11-149-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-141-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 Canto2012-11-141-4/+2
| |/ / / / | | | | | | | | | | | | | | | service)
| * | | | Added a few more AssemblyInfos. (Plus added the one in OptionalModules, ↵Diva Canto2012-11-135-0/+169
| | | | | | | | | | | | | | | | | | | | which had been forgotten.)
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-133-43/+0
| |\ \ \ \
| | * | | | Replace old Prebuild.exe accidentally added back in f977291 with one built ↵Justin Clark-Casey (justincc)2012-11-141-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.3Justin Clark-Casey (justincc)2012-11-141-0/+0
| | | | | |
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-1482-122/+195
| | |\ \ \ \
| | * | | | | Stop Prebuild from generating <copy> statements which unnecessarily copy ↵Justin Clark-Casey (justincc)2012-11-143-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 Canto2012-11-1316-17/+17
| | |/ / / / | |/| | | | | | | | | | | | | | | | have an AssemblyInfo file.
| * | | | | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll.Diva Canto2012-11-132-15/+0
| | | | | |
| * | | | | All optional modules' directives moved out of addin.xmlDiva Canto2012-11-139-8/+15
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-11-1359-84/+158
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | | | | Deleted .addin.xml. Added AssemblyInfo.csDiva Canto2012-11-132-15/+38
| | | | | |
| * | | | | Last 27 modules' directives (service connectors out).Diva Canto2012-11-1327-33/+54
| | | | | |
| * | | | | Another 11 modules' directions moved out of .addin.xmlDiva Canto2012-11-1312-14/+22
| | | | | |
| * | | | | Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-1321-22/+41
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-11-1316-82/+99
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Moved the WindModule and its own plugins out of .addin.xmlDiva Canto2012-11-124-5/+5
| | | | | |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-122-67/+74
| |\ \ \ \ \ | | |/ / / /
| | * | | | minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()Justin Clark-Casey (justincc)2012-11-131-0/+4
| | | | | |
| | * | | | Disable code to get server-side to move given items to a destination folder ↵Justin Clark-Casey (justincc)2012-11-131-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.xmlDiva Canto2012-11-1211-10/+20
| |/ / / /
* | | | | Merge branch 'master' into careminsterMelanie2012-11-137-6/+12
|\ \ \ \ \ | |/ / / /
| * | | | More module cleanup: removed the CoreModules.Framework modules directives ↵Diva Canto2012-11-127-6/+12
| | | | | | | | | | | | | | | | | | | | out of .addin.xml.
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1343-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/opensimDiva Canto2012-11-121-1/+1
| |\ \ \ \
| * | | | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-1244-44/+44
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update ScriptModuleComms name space to CoreModulesMelanie2012-11-131-1/+1
| |/ / / /
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1242-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
| * | | | Completely remove the IRegionModule interfaceMelanie2012-11-121-55/+0
| | | | |
| * | | | Stop closing old style modulesMelanie2012-11-121-9/+0
| | | | |
| * | | | Remove the old style module loader and all references to itMelanie2012-11-129-425/+21
| | | | |