aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-181-88/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Change the auth token to be the user's sessionid.Diva Canto2013-07-141-1/+4
| |
| * Guard against unauthorized agent deletes.Diva Canto2013-07-131-5/+11
| |
| * Deleted GET agent all around. Not used.Diva Canto2013-07-131-59/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| |\
| | * Print out caller IP when unusual requests are received.Diva Canto2013-07-071-1/+1
| | |
| * | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-081-2/+2
| |/ | | | | | | | | | | | | | | | | to print various counts of capability invocation by user and by cap This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected. This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle() However, existing inheriting classes overriding Handle() will still work, albeit without stats recording. "show caps" becomes "show caps list" to disambiguate between show caps commands
* | Merge branch 'master' into careminsterMelanie2013-06-231-27/+50
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-221-1/+0
| | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-211-26/+50
| |
* | Merge branch 'master' into careminsterMelanie2013-05-161-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Where this is not already happening, trigger asychoronous calls to ↵Justin Clark-Casey (justincc)2013-05-161-1/+1
| | | | | | | | | | | | | | CloseChildAgent() above the LocalSimulationConnector level. This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes). No functional change apart from elimination of unnecessary chaining of new threads.
* | Make agent creation at destination asynchronous. Failures here are prettyMelanie2012-09-161-1/+9
| | | | | | | | | | | | | | | | much guaranteed to be fatal and the few times this would dosconnect an agent are more than made up for by the increased throughput of replying and closing the connection vs. keeping it open during the heavy work. Also causes better feedback to the viewer as the time is now split between Requesting Teleport and Connectiong to Destination.
* | Merge branch 'master' into careminsterMelanie2012-07-011-48/+0
|\ \ | |/
| * Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-48/+0
| | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | Merge branch 'master' into careminsterMelanie2012-05-272-5/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * In remote QueryAccess, also receive the actual status (true|false) instead ↵Justin Clark-Casey (justincc)2012-05-251-2/+5
| | | | | | | | | | | | | | | | | | | | of always true no matter what the callee actually returned. This was due to two things 1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"]. But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what 2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result. The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
| * Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-242-3/+3
| | | | | | | | lookup rather than the region handle.
* | Merge branch 'master' into careminsterMelanie2012-03-141-7/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Minor sanity check on simulation agent handler (content type)Diva Canto2012-03-131-7/+12
| |
* | Merge branch 'master' into careminsterMelanie2012-02-231-3/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-3/+7
| | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into bigmergeMelanie2011-12-051-2/+2
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-2/+2
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-11-191-4/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for ↵Justin Clark-Casey (justincc)2011-11-191-2/+2
| | | | | | | | | | | | | | SendCreateChildAgent" message This is misleading since a simulator will call this method before successfully trying remote regions. Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-2/+1
| | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-131-0/+2
|\ \ | |/
| * This makes compression of fatpacks actually work. Previously they always ↵Diva Canto2011-05-111-3/+2
| | | | | | | | failed. See comment in WebUtil.
| * Revert "Functional improvement: close the stream. Non-functional: add debug ↵Diva Canto2011-05-111-19/+2
| | | | | | | | | | | | messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs." This reverts commit 5548f837501184d68c352097ad1a1de566e18ca0.
| * One more debug message. Don't use this unless your name is nebadon.Diva Canto2011-05-111-0/+3
| |
| * Functional improvement: close the stream. Non-functional: add debug messages ↵Diva Canto2011-05-111-2/+19
| | | | | | | | to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs.
| * Also compress the actual fatpacksMelanie2011-05-082-94/+171
| |
| * Remove a spammy debug I left in. Disable TP cancel button at the pointMelanie2011-05-081-1/+0
| | | | | | | | of no return.
| * Enable compressed (gzip) fatpack transfers.Melanie2011-05-082-131/+191
| |
* | Also compress the actual fatpacksMelanie2011-05-082-94/+171
| |
* | Remove a spammy debug I left in. Disable TP cancel button at the pointMelanie2011-05-081-1/+0
| | | | | | | | of no return.
* | Enable compressed (gzip) fatpack transfers.Melanie2011-05-082-131/+191
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-3/+6
|\ \ | |/
| * Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵Diva Canto2011-04-281-3/+6
| | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
| * Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-2/+9
| |
* | Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-2/+9
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-121-0/+5
|\ \ | |/
| * Comment previous debugDiva Canto2011-02-081-3/+3
| |
| * XFF header again -- debug.Diva Canto2011-02-081-0/+5
| |
| * Fix a typo in the QUERYACCESS method nameMelanie2011-02-051-1/+1
| |
| * Fix up QueryAccess to also check parcelsMelanie2011-01-281-1/+8
| |
* | Fix up QueryAccess to also check parcelsMelanie2011-01-281-1/+8
| |
* | Make bans work for teleport. Now teleport will complete block if the userMelanie2011-01-271-1/+1
| | | | | | | | | | | | | | is not allowed on the estate. If the user is allowed on no parcel, the teleport will also be blocked. If the user is allowed on a parcel, but not the desired one, the user will be shifted to the closest allowed location.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-1/+1
|\ \ | |/
generated by cgit v1.1 at 2024-11-07 18:47:23 +0000