aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-189-39/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | That didn't fix the problem.Diva Canto2013-07-131-1/+4
| | | | | | | | | | | | | | | | | | Revert "Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4." This reverts commit 682537738008746f0aca22954902f3a4dfbdc95f.
| * | Trying to reduce CPU usage on logins and TPs: trying radical elimination of ↵Diva Canto2013-07-131-4/+1
| |/ | | | | | | all FireAndForgets throughout CompleteMovement. There were 4.
| * Changed the UserProfileModule so that it's less greedy in terms of thread usage.Diva Canto2013-07-111-7/+5
| |
| * Revert "minor: remove some mono compiler warnings in UserProfileModule"Robert Adams2013-07-091-13/+16
| | | | | | | | | | | | | | Revert until we understand why all the calls to GetUserProfileServerURI were also commented out. This reverts commit 5f58b9b5526c401e039d27b8c92603ff02421fb8.
| * minor: remove some mono compiler warnings in UserProfileModuleJustin Clark-Casey (justincc)2013-07-091-16/+13
| |
| * For stat purposes, add names to capability request handlers where these were ↵Justin Clark-Casey (justincc)2013-07-081-3/+3
| | | | | | | | not set
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-084-23/+27
| |\
| | * Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to ↵Diva Canto2013-07-054-23/+27
| | | | | | | | | | | | be less dependent on a Scene.
| * | 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
| * Delete some verbose debug messagesDiva Canto2013-07-042-5/+5
| |
* | Merge branch 'master' into careminsterMelanie2013-07-042-25/+31
|\ \ | |/
| * More debug, same issueDiva Canto2013-07-042-1/+3
| |
| * More debug, same issueDiva Canto2013-07-041-2/+4
| |
| * More debug related to the previous commitDiva Canto2013-07-041-1/+1
| |
| * Now trying to find a cause of freeze at login related to friends status ↵Diva Canto2013-07-041-2/+5
| | | | | | | | notifications.
| * HG Friends: this was commented some commits ago, but it shouldn't have been.Diva Canto2013-07-041-25/+24
| |
| * Revert "HG Friends: debug an issue where the friends data stored in the DB ↵Diva Canto2013-07-041-1/+0
| | | | | | | | | | | | is incomplete." This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7.
| * HG Friends: debug an issue where the friends data stored in the DB is ↵Diva Canto2013-07-041-0/+1
| | | | | | | | incomplete.
* | Merge branch 'master' into careminsterMelanie2013-06-301-20/+21
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Revert "One more debug mantis #6625"Diva Canto2013-06-301-1/+0
| | | | | | | | | | | | | | This reverts commit 8fa5d12fcb73ffcc7144009e0147febcfa3ce704. Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Fixed previous debug messageDiva Canto2013-06-291-1/+1
| |
| * One more debug mantis #6625Diva Canto2013-06-291-0/+1
| |
| * More debug for mantis #6625. It looks like the home friends list is being ↵Diva Canto2013-06-291-20/+21
| | | | | | | | fetched on HG TPs.
| * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-06-181-23/+23
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Lock m_classifiedCache and m_classifiedInterest dictionary reads in ↵Justin Clark-Casey (justincc)2013-06-151-14/+13
| | | | | | | | | | | | UserProfileModule since in the presence of writes these are not thread-safe operations. Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
| * Correct build break in previous commit 9c530d7Justin Clark-Casey (justincc)2013-06-151-10/+7
| |
| * refactor: In UserProfileModule, change classifiedCache and ↵Justin Clark-Casey (justincc)2013-06-151-19/+23
| | | | | | | | | | | | classifiedInterest to m_classifiedCache and m_classifiedInterest This is the coding standard name style for private fields.
* | Merge branch 'avination-current' into careminsterMelanie2013-06-111-1/+1
|\ \
| * | Make objects attached from the ground appear in inventory again. Fixes a numberMelanie2013-06-081-1/+1
| | | | | | | | | | | | of interaction issues causing client crashes.
* | | Merge branch 'master' into careminsterMelanie2013-06-112-1/+14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | Catch exception triggered by incoming avatars using legacy profilesBlueWall2013-06-081-1/+10
| | |
| * | SQLite support for UserProfilesBlueWall2013-06-071-0/+1
| | |
| * | Ensure selected module is the only active oneBlueWall2013-06-071-0/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-072-4/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * | In LocalFriendshipTerminated, send the original client's agentId to the ↵Donnie Roberts2013-06-072-4/+4
| | | | | | | | | | | | friend being removed instead of the friend's own id.
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-061-10/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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 bug where an agent that declined an inventory offer and subsequently ↵Justin Clark-Casey (justincc)2013-04-301-2/+8
| | | | | | | | | | | | | | | | | | emptied their trash would make the item invalid in the giver's inventory This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
| * | Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-251-2/+1
| | |
| * | Gods module cleanupMelanie2013-04-251-10/+0
| | |
* | | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-061-14/+18
|\ \ \ | | |/ | |/|
| * | Prevent processing for NpcBlueWall2013-06-051-1/+3
| | |
| * | Remove a couple of orphaned linesBlueWall2013-06-051-3/+0
| | |
| * | Make locking more uniformBlueWall2013-06-051-14/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-042-9/+1335
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | Adding back the BasicProfileModuleBlueWall2013-05-312-73/+191
| | |
| * | UserProfilesBlueWall2013-05-302-176/+1386
| | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
generated by cgit v1.1 at 2025-03-06 02:23:02 +0000