aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-07-181-4/+3
|\ | | | | | | | | | | | | | | | | | | | | careminster Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * Merge branch 'master' into careminsterMelanie2013-07-131-16/+28
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| * \ Merge branch 'master' into careminsterMelanie2013-07-138-122/+164
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
* | \ \ Merge branch 'master' into careminsterMelanie2013-07-189-135/+191
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Moved SendInitialDataToMe to earlier in CompleteMovement. Moved ↵Diva Canto2013-07-131-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | TriggerOnMakeRootAgent to the end of CompleteMovement. Justin, if you read this, there's a long story here. Some time ago you placed SendInitialDataToMe at the very beginning of client creation (in LLUDPServer). That is problematic, as we discovered relatively recently: on TPs, as soon as the client starts getting data from child agents, it starts requesting resources back *from the simulator where its root agent is*. We found this to be the problem behind meshes missing on HG TPs (because the viewer was requesting the meshes of the receiving sim from the departing grid). But this affects much more than meshes and HG TPs. It may also explain cloud avatars after a local TP: baked textures are only stored in the simulator, so if a child agent receives a UUID of a baked texture in the destination sim and requests that texture from the departing sim where the root agent is, it will fail to get that texture. Bottom line: we need to delay sending the new simulator data to the viewer until we are absolutely sure that the viewer knows that its main agent is in a new sim. Hence, moving it to CompleteMovement. Now I am trying to tune the initial rez delay that we all experience in the CC. I think that when I fixed the issue described above, I may have moved SendInitialDataToMe to much later than it should be, so now I'm moving to earlier in CompleteMovement.
| * | Changed UploadBakedTextureModule so that it uses the same pattern as the ↵Diva Canto2013-07-121-8/+27
| |/ | | | | | | others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
| * Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they ↵Diva Canto2013-07-111-2/+2
| | | | | | | | are also non-blocking handlers.
| * Switched TransferRequest (UDP packet handler) to sync. The permissions ↵Diva Canto2013-07-111-99/+115
| | | | | | | | checks may block, so they get a FireAndForget. Everything else is non-blocking.
| * Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.Diva Canto2013-07-101-1/+1
| |
| * EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. ↵Diva Canto2013-07-101-1/+1
| | | | | | | | This _shouldn't_ screw things up, given that all this does is to dump the request in a queue.
| * Added show client-stats [first last] command to expose what viewers are ↵Diva Canto2013-07-102-15/+30
| | | | | | | | requesting.
| * Comment out old inbound UDP throttling hack. This would cause the UDPRobert Adams2013-07-091-0/+2
| | | | | | | | | | | | | | reception thread to sleep for 30ms if the number of available user worker threads got low. It doesn't look like any of the UDP packet types are marked async so this check is 1) unnecessary and 2) really crazy since it stops up the reception thread under heavy load without any indication.
| * Handle UUIDNameRequest UDP packet processing async instead of within the ↵Justin Clark-Casey (justincc)2013-07-091-1/+1
| | | | | | | | | | | | main inbound UDP processing loop, to avoid any chance that this is delaying the main udp in loop. The potential impact of this should be lower now that these requests are being placed on a queue.
| * For stat purposes, add names to capability request handlers where these were ↵Justin Clark-Casey (justincc)2013-07-082-3/+10
| | | | | | | | not set
| * Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-081-1/+1
| | | | | | | | | | | | | | | | | | 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
| * Fix mono warning in LLImageManagerTestsJustin Clark-Casey (justincc)2013-07-061-1/+1
| |
| * Get InventoryWorkerThreads to update watchdog on processing requestsJustin Clark-Casey (justincc)2013-07-061-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-07-042-2/+96
|\ \ | |/
| * Add --default option to "debug lludp packet" command to allow packet logging ↵Justin Clark-Casey (justincc)2013-07-041-17/+52
| | | | | | | | to be performed immediately from client start
| * change "debug packet" command to "debug lludp packet" to conform with other ↵Justin Clark-Casey (justincc)2013-07-041-0/+59
| | | | | | | | | | | | | | "debug lludp" options also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs gets all debug lludp commands to only activate for the set scene if not root
| * HG: close a loophole by which if something was wrong with the ServiceURLs it ↵Diva Canto2013-07-021-1/+1
| | | | | | | | resulted in never ending asset requests
* | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \ | |/ | | | | | | | | | | | | 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
| * minor: remove mono compiler warnings in WebFetchInvDescModuleJustin Clark-Casey (justincc)2013-06-171-3/+2
| |
| * Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9Justin Clark-Casey (justincc)2013-06-171-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-06-181-6/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Don't try to abort worker threads in WebFetchInvDescModule if module was not ↵Justin Clark-Casey (justincc)2013-06-141-6/+4
| | | | | | | | | | | | enabled. This also moves the abort to RemoveRegion() rather than a destructor.
* | Merge branch 'avination-current' into careminsterMelanie2013-06-111-10/+13
|\ \
| * | Explicitly set uploaded mesh object permsMelanie2013-06-101-10/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-082-1/+30
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-072-1/+30
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-071-1/+1
| | |\ \
| | | * | minor: Comment out debug logging (at warn level) about number of objects ↵Justin Clark-Casey (justincc)2013-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | force selected and turn down to debug level
| | * | | Put the configuration back in FetchInventoryDesc2 cap.Diva Canto2013-06-071-0/+29
| | |/ /
| * | | Supply proper type information for the various types of requestsMelanie2013-06-071-0/+1
| | | |
| * | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-072-4/+4
| |/ /
| * | Port Avination's inventory send throttlingMelanie2013-06-051-52/+213
| | |
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-064-7/+43
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Fix multi-wear of alpha and tattoo layers.Melanie2013-05-311-4/+4
| | |
| * | Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-251-16/+14
| | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
| * | Let the event queue do lees work - expire every 40s as per Teravus instead ↵Melanie2013-05-221-1/+1
| | | | | | | | | | | | of every seconds - whoever put that in....
| * | Explicitly zero avatar velocity on sitMelanie2013-05-131-0/+4
| | |
| * | Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
| * | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵Melanie2013-04-2818-235/+361
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into avination-current Conflicts: bin/Regions/Regions.ini.example
| | * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI.
| | * | Send 503 when throttling texturesMelanie2013-04-251-1/+33
| | | |
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-263-41/+58
| |\ \ \
| * \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-162-22/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-161-1/+4
| |\ \ \ \ \
| | * | | | | fix STATE udp queue data rate since it is in use again, after beingUbitUmarov2013-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | removed by intel folks (?)( should it be used or removed ??)
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-161-2/+12
| |\ \ \ \ \ \ | | |/ / / / /