aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-281-1/+24
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
| * minor: Fix usage error message for "debug eq" console commandJustin Clark-Casey (justincc)2013-03-281-1/+1
| |
| * Add "show eq" console command to show numbers of messages in agent event queues.Justin Clark-Casey (justincc)2013-03-281-0/+23
| | | | | | | | For debugging purposes.
* | Merge branch 'master' into careminsterMelanie2013-03-131-1/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * minor: Remove mono compiler warnings in EventQueueTestsJustin Clark-Casey (justincc)2013-03-111-1/+3
| |
| * Plumb the path from the client to the extra physics params and backMelanie2013-02-072-0/+28
| |
* | Merge branch 'avination' into careminsterMelanie2013-03-031-2/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+1
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-11-111-51/+36
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * One more module: EventQueueGetModule. Also making it non-optional for this dll.Diva Canto2012-11-101-53/+38
| |
* | Merge branch 'master' into careminsterMelanie2012-10-161-4/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * minor: Add missing newlines and spacing to help for "debug eq" console commandJustin Clark-Casey (justincc)2012-10-161-4/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-10-121-11/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to ↵Justin Clark-Casey (justincc)2012-10-101-11/+2
| | | | | | | | | | | | prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established. This should remove the need to run the console command "kick user --force" when these connections are left around.
* | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | just remove the damm thingUbitUmarov2012-09-261-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-1/+8
|\ \ \ | |/ /
| * | bug fixUbitUmarov2012-09-041-4/+6
| | |
| * | a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-041-1/+6
| | | | | | | | | | | | flight. FS 4.2.2 does not.
* | | Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | Merge branch 'avination' into careminsterMelanie2012-07-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-1/+1
| | | | | | | | | | | | it's timeout
* | | 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-151-1/+10
|\ \ \ | |/ /
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-151-1/+10
| | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
* | | Merge branch 'master' into careminsterMelanie2012-05-191-39/+61
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| | |
| * | Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| | | | | | | | | | | | Refactor: eq message logging into common method.
| * | refactor: move EventQueueGet path generation into common method. Rename ↵Justin Clark-Casey (justincc)2012-05-181-20/+33
| | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use.
* | | Merge branch 'master' into careminsterMelanie2012-05-051-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-031-2/+6
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'master' into careminsterMelanie2012-04-271-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-271-1/+1
| | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
* | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-152-0/+28
|/ | | | For now on caps/EventQueue, and still only used on a material change...
* Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-071-6/+0
| | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-291-0/+1
|
* Correct mistake in "debug eq" helpJustin Clark-Casey (justincc)2011-11-291-1/+1
|
* comment out a noisy log line I accidentally left in from the last commitJustin Clark-Casey (justincc)2011-11-241-1/+1
|
* Stop passing a request handler to the initial caps.RegisterHandler in ↵Justin Clark-Casey (justincc)2011-11-241-157/+162
| | | | | | EventQueueGetModule since this is immediatley replaced by a poll server handler. This allows us to comment out a bunch of code and simplify the codebase and readability.
* Add a "debug eq" console command for debugging.Justin Clark-Casey (justincc)2011-11-241-6/+79
| | | | This will log outgoing event queue message names if turned on.
* Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-0/+1
| | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* Fix bugs in EventQueueGetModule.ClientClosed() and ↵Justin Clark-Casey (justincc)2011-10-242-4/+22
| | | | | | BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler Actually doing the tear down appear to have no ill effects with region crossing and teleport.
* separate out future common setup code from EventQueueTests.AddForClient()Justin Clark-Casey (justincc)2011-10-241-8/+14
|
generated by cgit v1.1 at 2024-12-30 14:00:59 +0000