aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-09-161-0/+2
| | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)
* Merge branch 'master' into careminsterMelanie2013-09-072-18/+17
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove test that gives issue on Windows, just let the try/catch do the work.BlueWall2013-09-021-5/+1
| |
| * Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-021-6/+9
| | | | | | | | | | | | | | | | 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-09-012-17/+27
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profiles: Clean up some log entries caused when visiting HG avatar is using ↵BlueWall2013-08-291-16/+26
| | | | | | | | legacy profiles
| * Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1
| | | | | | | | printed the error message and not the call stack.
* | Merge branch 'master' into careminsterMelanie2013-08-173-38/+20
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * Remove mono compiler warnings from UserProfilesModuleJustin Clark-Casey (justincc)2013-08-171-19/+16
| |
| * minor: remove mono compiler warning from AttachmentsModuleJustin Clark-Casey (justincc)2013-08-171-2/+1
| |
| * Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() ↵Justin Clark-Casey (justincc)2013-08-171-2/+2
| | | | | | | | | | | | regression test for v2 transfers. Also adjusts names of teleport setup helpers in EntityTransferHelpers
| * refactor: Make ↵Justin Clark-Casey (justincc)2013-08-161-1/+1
| | | | | | | | AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use already available TestClient handle rather than retrieving it via the ScenePresence
| * minor: remove unused entity transfer config in teleport v2 attachments testJustin Clark-Casey (justincc)2013-08-141-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-08-131-1/+112
|\ \ | |/
| * Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for ↵Justin Clark-Casey (justincc)2013-08-121-1/+112
| | | | | | | | V2 transfer protocol.
* | Merge branch 'master' into careminsterMelanie2013-08-071-3/+15
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Move experimental attachments throttling further down the chain so that ↵Justin Clark-Casey (justincc)2013-08-021-16/+15
| | | | | | | | multiple attachments changes (e.g. change outfit) are also throttled
* | Make atachment state load work againMelanie2013-08-021-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-08-011-15/+87
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Add experimental "debug attachments throttle <ms>" setting (command line) ↵Justin Clark-Casey (justincc)2013-08-011-15/+87
| | | | | | | | | | | | | | | | | | | | and ThrottlePer100PrimsRezzed in [Attachments] in config This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously. It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in. Default is 0 (no throttling). "debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable. Also adds "debug attachments status" command to show current throttle and debug logging levels.
* | Merge branch 'master' into careminsterMelanie2013-07-292-2/+11
|\ \ | |/ | | | | | | | | 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.
| * Fix regression tests relating to agent transfer by making simulator use last ↵Justin Clark-Casey (justincc)2013-07-261-0/+9
| | | | | | | | week's SIMULATOR/0.1 protocol for now.
* | 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
| |