aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge commit 'e9153e1d1aae50024d8cd05fe14a9bce34343a0e' into careminsterMelanie2012-11-200-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-15337-30953/+13136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| | * | | Merge master into teravusworkteravus2012-11-15336-13123/+30950
| | |\ \ \
| * | \ \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-204-78/+546
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| | * | | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | * 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 careminsterMelanie2012-11-1910-352/+220
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | BulletSim: Use base class constructors for initialization of BSShape and ↵Robert Adams2012-11-184-216/+214
| | | | | | | | | | | | | | | | | | | | | | | | other classes.
| | * | | | BulletSim: fix the problem with flying being disabled when crossing region ↵Robert Adams2012-11-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | boundries.
| | * | | | BulletSim: remove the obsolete interface to the Bullet code. Update ↵Robert Adams2012-11-185-134/+0
| | | | | | | | | | | | | | | | | | | | | | | | BulletSim libraries with code stripped of the obsolete code.
| * | | | | 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
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | This implements the Caps throttler. After some testing, the system seemed ↵teravus2012-11-051-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 ↵teravus2012-11-052-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 --> ↵teravus2012-11-048-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.
| * | | | | Merge branch 'master' into careminsterMelanie2012-11-1738-1035/+1285
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Remove old InventoryService, which has for a long time been replaced by ↵Justin Clark-Casey (justincc)2012-11-172-782/+0
| | | | | | | | | | | | | | | | | | | | | | | | XInventoryService.
| | * | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-175-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-172-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-173-1/+143
| | | | | |
| | * | | | refactor: Move stat classes out of StatManager and into their own files for ↵Justin Clark-Casey (justincc)2012-11-163-260/+326
| | | | | | | | | | | | | | | | | | | | | | | | clarity.
| | * | | | 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
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.1 at 2024-12-30 13:44:36 +0000