aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Intermediate commit. Sill errors.Melanie2014-01-052-22/+48
|\ | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-042-19/+45
| | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| * Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵Justin Clark-Casey (justincc)2013-12-181-3/+3
| | | | | | | | sending
* | Merge branch 'master' into careminsterMelanie2013-12-071-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: Use enums for setting inv/asset types on data upload rather than ↵Justin Clark-Casey (justincc)2013-12-061-7/+7
| | | | | | | | magic numbers
| * Properly set InventoryType.Snapshot when a snapshot is uploadedJustin Clark-Casey (justincc)2013-12-061-0/+4
| | | | | | | | | | Resolves http://opensimulator.org/mantis/view.php?id=6857 This prevents the inventory service complaining later about an attempt to change an invariant
* | Merge branch 'master' into careminsterMelanie2013-11-082-6/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * minor: remove mono compiler warnings in AvatarPickerSearchModule and ↵Justin Clark-Casey (justincc)2013-10-312-7/+3
| | | | | | | | UploadBakedTextureModule
* | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-10-044-23/+41
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-222-0/+5
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
| * Change handling of the FetchInventoryDescendents2 capability configuration ↵Mic Bowman2013-09-111-23/+36
| | | | | | | | | | | | to allow for external handlers.
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-23/+34
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Add support for simple external CAPS texture servicesroot2013-09-071-19/+31
| | |
* | | Merge branch 'master' into careminsterMelanie2013-09-071-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | hear chat from their source region for some time after teleport completion. This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat. This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running. This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
* | | Merge branch 'master' into careminsterMelanie2013-08-171-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * | minor: Comment out AvatarPicketSearch caps log message for now, which is ↵Justin Clark-Casey (justincc)2013-08-141-1/+1
| | | | | | | | | | | | occuring on every login and entity transfer
* | | Merge branch 'master' into careminsterMelanie2013-08-131-3/+8
|\ \ \ | |/ /
| * | minor: Extend warning message when adding trying to add an event for a ↵Justin Clark-Casey (justincc)2013-08-121-3/+8
| | | | | | | | | | | | client without a queue to include the event message name.
* | | Merge branch 'master' into careminsterMelanie2013-08-111-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fix an issue where under teleport v2 protocol, teleporting from regions in ↵Justin Clark-Casey (justincc)2013-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an line from A->B->C would not close region A when reaching C The root cause was that v2 was only closing neighbour agents if the root connection also needed a close. However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection. This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports). Also, has not been completely tested yet in scenarios where regions are running on different simulators
* | | Merge branch 'master' into careminsterMelanie2013-08-012-27/+24
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * | Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-1/+5
| | | | | | | | | | | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
| * | Doing the HG Map / SimulatorFeatures "the right way": moved it to ↵Diva Canto2013-07-301-12/+3
| | | | | | | | | | | | | | | | | | | | | HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does). Only HG Visitors get this var, to avoid spamming local users. The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
| * | After talking to lkalif on the IRC: SimulatorFeatures response: renamed the ↵Diva Canto2013-07-301-6/+7
| | | | | | | | | | | | | | | | | | OSDMap GridServices to OpenSimExtras, normalized the url keys under it, and moved ExportEnabled to under it too. Melanie: change your viewer code accordingly. Documentation at http://opensimulator.org/wiki/SimulatorFeatures_Extras
* | | Merge branch 'master' into careminsterMelanie2013-07-291-54/+16
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-2/+2
| | | | | | | | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| * | Slight improvement: no need to delay the removal of the queues in EQ, ↵Diva Canto2013-07-261-8/+0
| | | | | | | | | | | | because DisableSimulator is now being sent via UDP
| * | This should fix all issues with teleports. One should be able to TP as fast ↵Diva Canto2013-07-251-44/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on: - Child and root agents are only closed after 15 sec, maybe - If the user comes back, they aren't closed, and everything is reused - On the receiving side, clients and scene presences are reused if they already exist - Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
* | | Merge branch 'master' into careminsterMelanie2013-07-245-97/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post ↵Diva Canto2013-07-181-2/+9
| | | | | | | | | | | | | | | | | | requests timeout in 60 secs. There's plenty of room for improvement in handling the EQs. Some other time...
| * | Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | successfully tested, and I'm merging back those changes, which proved to be good. Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"" This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
| * | Revert "Cleared up much confusion in PollServiceRequestManager. Here's the ↵Diva Canto2013-07-171-5/+3
| | | | | | | | | | | | | | | | | | history:" This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
| * | Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-171-3/+5
| | | | | | | | | | | | | | | | | | When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle! This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached. This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
| * | revert last commit which seems to conflict with DoubleQueue internals. The ↵dahlia2013-07-161-10/+5
| | | | | | | | | | | | random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
| * | add locking to internal queue in WebFetchInvDescModule; lack of which caused ↵dahlia2013-07-161-5/+10
| | | | | | | | | | | | a random crash in a load test yesterday
| * | Simplify EventQueue cap setup so that it is also stat monitored.Justin Clark-Casey (justincc)2013-07-161-45/+29
| | | | | | | | | | | | Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-151-2/+3
| |\ \
| | * | Guard against null refDiva Canto2013-07-151-1/+2
| | | |
| * | | Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-153-48/+33
| |/ / | | | | | | | | | | | | | | | | | | handlers. This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding. Other refactoring was required to get logic into the right places to support this.
* | | Merge branch 'master' into careminsterMelanie2013-07-131-16/+28
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2013-07-134-4/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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
| * | Get InventoryWorkerThreads to update watchdog on processing requestsJustin Clark-Casey (justincc)2013-07-061-0/+2
| | |
| * | minor: remove mono compiler warnings in WebFetchInvDescModuleJustin Clark-Casey (justincc)2013-06-171-3/+2
| | |
generated by cgit v1.1 at 2024-12-23 14:20:00 +0000