aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-042-2/+5
| | | | | | | | | | | | it's timeout
| * | *test2* http poll: increased again the pool rate do 10/s but increased ↵UbitUmarov2012-07-041-2/+2
| | | | | | | | | | | | timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable
| * | *test* slow http retries pool rate to original 1sUbitUmarov2012-07-041-1/+1
| | |
| * | *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued ↵UbitUmarov2012-07-012-0/+206
| | | | | | | | | | | | to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming.
* | | Merge branch 'master' into careminsterMelanie2012-07-051-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS ↵Justin Clark-Casey (justincc)2012-07-041-3/+3
| | | | | | | | | | | | to reflect what it actually is
| * | Add preservation of running state of scripts when drag-copying.Melanie2012-07-011-0/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-012-2/+2
|\ \ \ | |/ /
| * | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-302-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-06-291-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add IScene.Name for code clarity to replace the RegionInfo.RegionName used ↵Justin Clark-Casey (justincc)2012-06-291-0/+5
| | | | | | | | | | | | in many, many log messages.
* | | Merge branch 'avination' into careminsterMelanie2012-06-293-5/+22
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Fix llRegionSayTo the right wayMelanie2012-06-281-0/+7
| | |
| * | Add an event to the poll service manager thread to allow starting itMelanie2012-06-262-4/+14
| | | | | | | | | | | | when needed rather than once per second. That is just too slow!
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-281-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
* | | Merge branch 'master' into careminsterMelanie2012-06-281-0/+15
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.Justin Clark-Casey (justincc)2012-06-261-0/+15
| | | | | | | | | | | | Use these for new "show regions" command rather than old cumbersome stuff.
* | | Merge branch 'master' into careminsterMelanie2012-06-263-6/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Avoid a race condition where an incoming request to a script external URL ↵Justin Clark-Casey (justincc)2012-06-222-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can trigger an exception is the URL was being removed at the same time. This involves three steps 1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index 2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests. 3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK. Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
| * | If starting scripts on initial sim start, provide INFO level log feedback ↵Justin Clark-Casey (justincc)2012-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | each time 50 scripts have been started. This is to provide an indication of what's happening now that the default isn't to report every single script start. Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
* | | Merge branch 'master' into careminsterMelanie2012-06-212-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Remove STARTUP COMPLETE message from the startuplogo.txt file and into main ↵Justin Clark-Casey (justincc)2012-06-201-1/+3
| | | | | | | | | | | | logging
| * | Comment out the neighbour and land in connectors from info logging that they ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | are starting up
| * | Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses ↵Justin Clark-Casey (justincc)2012-06-161-3/+1
| | | | | | | | | | | | would always return OK even if some other status code had been set
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | |/ /
| * | Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | | | | | scattering them over other categories
* | | Merge branch 'master' into careminsterMelanie2012-06-152-29/+195
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-11-06 03:51:29 +0000