aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-09-071-1/+8
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop "show client stats" from throwing an exception if somehow ↵Justin Clark-Casey (justincc)2013-09-041-1/+8
| | | | | | | | | | | | | | | | Scene.m_clientManager still retains a reference to a dead client. Instead, "show client stats" now prints "Off!" so that exception is not thrown and we know which entries in ClientManager are in this state. There's a race condition which could trigger this, but the window is extremely short and exceptions would not be thrown consistently (which is the behaviour observed). It should otherwise be impossible for this condition to occur, so there may be a weakness in client manager IClientAPI removal.
* | Merge branch 'master' into careminsterMelanie2013-09-011-0/+220
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Stop "handle sit user name" command from trying to sit avatars on objects ↵Justin Clark-Casey (justincc)2013-08-221-0/+3
| | | | | | | | which have sit positions but are attachments
| * Stop "sit user name" and "stand user name" console commands from trying to ↵Justin Clark-Casey (justincc)2013-08-221-2/+8
| | | | | | | | sit/stand avatars already sitting/standing
| * Add --regex options to "sit user name" and "stand user name" console ↵Justin Clark-Casey (justincc)2013-08-201-50/+81
| | | | | | | | | | | | | | commands to sit/stand many avatars at once. Currently, first name and last name are input separate but are concatenated with a space in the middle to form a regex. So to sit all bots with the first name "ima", for instance, the command is "sit user name --regex ima .*"
| * Add experimental "sit user name" and "stand user name" console commands in ↵Justin Clark-Casey (justincc)2013-08-201-0/+180
| | | | | | | | | | | | | | SitStandCommandsModule. "sit user name" will currently only sit the given avatar on prims which have a sit target set and are not already sat upon. Chiefly for debug purposes.
* | Merge branch 'master' into careminsterMelanie2013-08-132-2/+3
|\ \ | |/
| * Don't try and send group updates to NPCs via event queue, since NPCs have no ↵Justin Clark-Casey (justincc)2013-08-121-1/+0
| | | | | | | | | | | | | | event queue. I think there is an argument for sending this information to NPCs anyway since in some cases it appears a lot easier to write server-side bots by hooking into such internal events. However, would need to stop event messages building up on NPC queues if they are never retrieved.
| * Get rid of issue where removing NPCs would through an exception by routing ↵Justin Clark-Casey (justincc)2013-08-121-1/+3
| | | | | | | | | | | | close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather than directly to Scene.RemoveClient(). This exception was actually harmless since it occurred at the very last stage of the remove client process.
* | Merge branch 'master' into careminsterMelanie2013-08-071-5/+60
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'Robert Adams2013-08-021-5/+60
| | | | | | | | | | and processing routines in BulletSim. Add linkset rebuild/conversion routine in BSLinkset.
* | Merge branch 'master' into careminsterMelanie2013-08-011-8/+46
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * BulletSim: test method for debugging of extended physics script operations.Robert Adams2013-07-301-8/+46
| |
* | Merge branch 'master' into careminsterMelanie2013-07-294-35/+25
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that ↵Diva Canto2013-07-281-16/+6
| | | | | | | | handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
| * Commented out ChatSessionRequest capability in Vivox and Freeswitch. We ↵Diva Canto2013-07-262-18/+18
| | | | | | | | aren't processing it in any meaningful way, and it seems to get invoked everytime someone types a message in group chat.
| * Fix NPC regression test failures.Justin Clark-Casey (justincc)2013-07-261-1/+1
| | | | | | | | | | These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come. Instead, we do not wait if the agent is an NPC.
* | Merge branch 'master' into careminsterMelanie2013-07-243-5/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to ↵Diva Canto2013-07-212-2/+2
| | | | | | | | lkalif for telling me how to route the information. The viewer effect is under the distance filter, so only avatars with cameras < 10m away see the beams.
| * Manage AgentUpdates more sanely:Diva Canto2013-07-212-0/+2
| | | | | | | | | | | | - The existing event to scene has been split into 2: OnAgentUpdate and OnAgentCameraUpdate, to better reflect the two types of updates that the viewer sends. We can run one without the other, which is what happens when the avie is still but the user is camming around - Added thresholds (as opposed to equality) to determine whether the update is significant or not. I thin these thresholds are ok, but we can play with them later - Ignore updates of HeadRotation, which were problematic and aren't being used up stream
| * Fixed the stats in show client stats. Also left some comments with ↵Diva Canto2013-07-211-4/+4
| | | | | | | | observations about AgentUpdates.
| * Make the check as to whether any particular inbound AgentUpdate packet is ↵Justin Clark-Casey (justincc)2013-07-211-2/+2
| | | | | | | | | | | | significant much earlier in UDP processing (i.e. before we pointlessly place such packets on internal queues, etc.) Appears to have some impact on cpu but needs testing.
| * Add measure of number of inbound AgentUpdates that were seen as significant ↵Justin Clark-Casey (justincc)2013-07-211-3/+9
| | | | | | | | | | | | | | | | | | to "show client stats" (i.e. sent on for further processing instead of being discarded) Added here since it was the most convenient place Number is in the last column, "Sig. AgentUpdates" along with percentage of all AgentUpdates Percentage largely falls over time, most cpu for processing AgentUpdates may be in UDP processing as turning this off even earlier (with "debug lludp toggle agentupdate" results in a big cpu fall Also tidies up display.
* | Merge branch 'master' into careminsterMelanie2013-07-241-2/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Attachments module only registers when enabled. This enables alternative ↵Dan Lake2013-07-161-2/+4
| | | | | | | | attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
* | Merge branch 'master' into careminsterMelanie2013-07-184-16/+117
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Try naming the materials handlers again, this time registering the POST as ↵Justin Clark-Casey (justincc)2013-07-111-3/+6
| | | | | | | | | | | | | | | | RenderMaterials This was probably the mistake. The other handlers are named RenderMaterials as well but this actully has no affect apart from on stats, due to a (counterintuitive) disconnect between the registration name and the name of the request handler. Will be tested very soon and reverted if this still does not work.
| * remove names from Capability handlers (added by justincc in commit ↵dahlia2013-07-101-7/+4
| | | | | | | | 013710168b3878fc0a93a92a1c026efb49da9935) as they seem to disable the use of multiple access methods for a single Capability in MaterialsDemoModule
| * show client stats: Fixed the requests/min. Also changed the spelling of the ↵Diva Canto2013-07-101-21/+22
| | | | | | | | command, not without the dash.
| * Added show client-stats [first last] command to expose what viewers are ↵Diva Canto2013-07-101-2/+107
| | | | | | | | requesting.
| * remove some cruft and trigger a rebuilddahlia2013-07-081-1/+0
| |
| * remove an invalid null UUID check which caused a warningdahlia2013-07-081-8/+1
| |
| * For stat purposes, add names to capability request handlers where these were ↵Justin Clark-Casey (justincc)2013-07-081-4/+7
| | | | | | | | not set
| * Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-082-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-301-47/+130
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-06-281-67/+69
| |\
| | * Reinsert code for gathering uuids reference by materials back directly into ↵Justin Clark-Casey (justincc)2013-06-281-67/+69
| | | | | | | | | | | | | | | | | | | | | UuidGatherer for now. This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes. There needs to be some way for modules to register for events which are not connected with a particular scene.
| * | add some locking to materials storage dictionarydahlia2013-06-281-30/+42
| |/
| * and yet another check for null returned from DynAttrs.GetStore()dahlia2013-06-271-0/+4
| |
| * test for null return from DynAttrs.GetStore()dahlia2013-06-271-0/+3
| |
| * refactor: Move code for gathering textures referenced by materials into ↵Justin Clark-Casey (justincc)2013-06-271-2/+70
| | | | | | | | | | | | MaterialsDemoModule from UuidGatherer This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-271-16/+10
| | | | | | | | | | | | | | | | This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc. All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace. This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors. This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release. However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
* | Merge branch 'master' into careminsterMelanie2013-06-231-339/+0
|\ \ | |/ | | | | | | | | | | | | 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
| * Make general server stats available on the robust console as well as the ↵Justin Clark-Casey (justincc)2013-06-171-339/+0
| | | | | | | | | | | | simulator console This means the "show stats" command is now active on the robust console.
* | Merge branch 'avination-current' into careminsterMelanie2013-06-231-1/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * | Add a result param to te money module interfaceMelanie2013-06-131-1/+2
| | |
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-062-2/+243
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-254-17/+12
| | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
| * | Small adjustments to the floater moduleMelanie2013-05-131-1/+4
| | |