aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-15159-15158/+6023
| | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| | * | Merge master into teravusworkteravus2012-11-15159-6023/+15158
| | |\ \
* | | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-202-72/+409
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-092-73/+410
| | | | | | | | | | | | | | | | | | | | * 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-196-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-181-134/+0
| | | | | | | | | | | | | | | | | | | | BulletSim libraries with code stripped of the obsolete code.
* | | | | Merge branch 'avination' into careminsterMelanie2012-11-1710-46/+254
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Prevent a buffer overflow in asset receivingMelanie2012-11-171-11/+20
| | | | |
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-11-063-20/+31
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | removed potencial null refs and rearrange code a bitUbitUmarov2012-11-041-13/+19
| | | | |
| | * | | actually remove the use of random on persist timmingsUbitUmarov2012-11-021-4/+6
| | | | |
| | * | | Create a new random when needed using normal time based seed instead ofUbitUmarov2012-11-021-2/+5
| | | | | | | | | | | | | | | | | | | | reusing a shared one than may not be valid
| | * | | add debug position on bad primmesh errorUbitUmarov2012-11-021-2/+2
| | | | |
| * | | | 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-051-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-046-1/+73
| | | | | | | | | | | | | | | | | | | | 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 Canto2012-11-041-9/+12
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-173-5/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-172-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ↵Justin Clark-Casey (justincc)2012-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'master' into careminsterMelanie2012-11-155-116/+214
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | 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-153-63/+107
| | | | | | | | | | | | | | | | | | | | 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-1535-37/+606
|\ \ \ \ \ | |/ / / /
| * | | | Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-1420-4/+532
| | | | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-141-0/+14
| |\ \ \ \
| | * | | | 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-131-0/+37
| | | | | | | | | | | | | | | | | | | | which had been forgotten.)
| * | | | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-136-6/+6
| | | | | | | | | | | | | | | | | | | | 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-1315-82/+95
|\ \ \ \ \ | |/ / / /
| * | | | 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-121-67/+70
| |\ \ \ \
| | * | | | 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-1336-38/+35
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs