aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-08-183-3/+60
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * When reporting a thread timeout, create a copy of the info rather than ↵Justin Clark-Casey (justincc)2012-08-181-1/+14
| | | | | | | | | | | | | | passing the original ThreadWatchdogInfo structure. This is to avoid the possibility of misleading reporting if a watchdog update outraces an alarm. Should address any remaining issues from http://opensimulator.org/mantis/view.php?id=6012
| * adding a clip method to handle Vector3 objects to enable a minor amount of ↵SignpostMarv2012-08-171-0/+6
| | | | | | | | refactoring
| * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-151-2/+40
| |
* | Merge branch 'master' into careminsterMelanie2012-08-161-5/+26
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-151-5/+26
| | | | | | | | This is to avoid false positives when the machine is under heavy load whilst starting up.
| * Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-145-3/+21
| | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console.
* | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-151-1/+1
| |
* | Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-145-3/+21
| | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console.
* | Merge branch 'master' into careminsterMelanie2012-08-042-35/+72
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Fix old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-032-35/+72
| | | | | | | | | | | | This was working in 0.7.2 but was accidentally removed from 0.7.3. The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info. Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved.
* | Merge branch 'master' into careminsterMelanie2012-07-2815-19/+172
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * making first run more resilient to bad input (loop until good input, rather ↵SignpostMarv2012-07-271-7/+19
| | | | | | | | than crash)
| * minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ↵Justin Clark-Casey (justincc)2012-07-271-1/+1
| | | | | | | | currently calculated dynamically
| * Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-1/+0
| |
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-256-2/+6
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-258-11/+9
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * Add MemoryWatchdog class missing from git master a1e9964Justin Clark-Casey (justincc)2012-07-251-0/+129
| |
| * Correct churn stat from MB/s from KB/sJustin Clark-Casey (justincc)2012-07-251-1/+1
| |
| * Add experimental "OpenSim object memory churn" statistics to output of ↵Justin Clark-Casey (justincc)2012-07-252-8/+15
| | | | | | | | | | | | | | | | region console "show stats" command This aims to capture the amount of memory that OpenSim turns over whilst operating a region. This memory is not lost - apart from leaks it is reclaimed by the garbage collector. However, the more memory that gets turned over the more work the GC has to do to reclaim it.
| * Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-0/+8
| | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
| * Committing Avination's memleak fix-a-thon, installment #2Melanie2012-07-231-1/+10
| | | | | | | | | | Ensure items coming off the lockless queue are released. Also ensure this is done when the queue is cleared.
| * Commiting Avination's memleak fix-a-thon, installment #1Melanie2012-07-231-4/+8
| | | | | | | | | | As the MinHeap shrinks, free object references that have been sent. Also, free the last item when it empties.
* | Merge branch 'avination' into careminsterMelanie2012-07-201-1/+1
|\ \
| * | Fix slow loading of task inventoryMelanie2012-07-191-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-191-0/+5
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are ↵Justin Clark-Casey (justincc)2012-07-191-0/+5
| | | | | | | | | | | | | | enabled or disabled at any point, not just during initial startup. This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled and was affected by a bug where it would never fire if the region started with logins disabled.
* | Merge branch 'ubitwork' into avinationMelanie2012-07-171-10/+47
|\ \
| * | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
| | |
* | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-7/+6
|/ / | | | | | | event exceptions to see call path leading up to it.
* | Merge branch 'avination' into careminsterMelanie2012-07-161-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
| | | | | | | | | | | | CN
* | | Merge branch 'master' into careminsterMelanie2012-07-134-4/+7
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-132-3/+2
| | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
| * | Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-121-1/+0
| | | | | | | | | | | | IClientAPI.RemoteEndpoint.
| * | Extend "show circuits" to show circuit code, ip and viewer name.Justin Clark-Casey (justincc)2012-07-121-0/+5
| | | | | | | | | | | | | | | Also change to use standard table formatting "show circuits" and "show connections" console commands are very similar but access different data structures.
* | | Merge branch 'master' into careminsterMelanie2012-07-126-27/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-116-27/+19
| | | | | | | | | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* | | Merge branch 'avination' into careminsterMelanie2012-07-113-9/+38
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | stop keeping references to objects on released itemsUbitUmarov2012-07-111-1/+10
| | |
| * | Make sure handles stay intact when removing from the MinHeapMelanie2012-07-111-5/+8
| | |
| * | clear released minheap items so they don't keep holding references toUbitUmarov2012-07-111-0/+1
| | | | | | | | | | | | objects.
| * | add some more memory information to StatsCollectorUbitUmarov2012-07-101-4/+20
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-111-2/+22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Log warning if time between invocations of the watchdog thread is twice the ↵Justin Clark-Casey (justincc)2012-07-051-2/+22
| | | | | | | | | | | | | | | | | | timer setting. This is to help detect situations where thread timeout warnings are being generated because of general machine issues rather than deadlock, network or other problems.
* | | Merge branch 'avination' into careminsterMelanie2012-07-064-3/+252
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Convert the slow request queue into a regular queue and add some cleanupMelanie2012-07-061-4/+18
| | | | | | | | | | | | and locking.
| * | Fix the boo-booMelanie2012-07-051-3/+3
| | |
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-052-11/+34
| | | | | | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before.
| * | use the pollEvent timeout paramenter on poolingUbitUmarov2012-07-041-4/+7
| | |
generated by cgit v1.1 at 2024-12-25 21:16:52 +0000