aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-07-181-2/+5
|\ | | | | | | | | | | | | | | | | | | | | 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-8/+12
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| * \ Merge branch 'master' into careminsterMelanie2013-07-137-73/+159
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1810-85/+194
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Let's go easy on authenticating ChildAgentUpdates, otherwise this will be ↵Diva Canto2013-07-141-7/+5
| | | | | | | | | | | | | | | | chaotic while ppl are using different versions of opensim. Warning only, but no enforcement.
| * | | Fix broken tests -- the test setup was wrong... sigh.Diva Canto2013-07-141-0/+1
| | | |
| * | | Authenticate ChildAgentUpdate too.Diva Canto2013-07-142-16/+29
| | | |
| * | | Change the auth token to be the user's sessionid.Diva Canto2013-07-142-3/+3
| | | |
| * | | And this fixes the other failing tests. Justin, the thread pool is not being ↵Diva Canto2013-07-131-2/+0
| | | | | | | | | | | | | | | | initialized in the tests!
| * | | This should fix the failing test.Diva Canto2013-07-131-2/+1
| | | |
| * | | Deleted a line too manyDiva Canto2013-07-131-0/+3
| | | |
| * | | Guard against unauthorized agent deletes.Diva Canto2013-07-133-10/+30
| | | |
| * | | Some more debug to see how many threads are available.Diva Canto2013-07-131-0/+2
| | | |
| * | | That didn't fix the problem.Diva Canto2013-07-131-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | 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-34/+26
| | | | | | | | | | | | | | | | all FireAndForgets throughout CompleteMovement. There were 4.
| * | | This commit effectively reverses the previous one, but it's just to log that ↵Diva Canto2013-07-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | we found the root of the rez delay: the priority scheme BestAvatarResponsiveness, which is currently the default, was the culprit. Changing it to FrontBack made the region rez be a lot more natural. BestAvatarResponsiveness introduces the region rez delay in cases where the region is full of avatars with lots of attachments, which is the case in CC load tests. In that case, the inworld prims are sent only after all avatar attachments are sent. Not recommended for regions with heavy avatar traffic!
| * | | Same issue as previous commit.Diva Canto2013-07-131-3/+4
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-131-8/+12
| |\ \ \ | | | |/ | | |/|
| | * | Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() ↵Justin Clark-Casey (justincc)2013-07-131-8/+12
| | |/ | | | | | | | | | | | | | | | | | | | | | in order to avoid a race condition. A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing. If this is now impossible please revert - just adding this now whilst I remember. Also makes method comment into proper method doc.
| * | Moved SendInitialDataToMe to earlier in CompleteMovement. Moved ↵Diva Canto2013-07-131-5/+14
| |/ | | | | | | | | | | | | | | 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.
| * Centralize duplicated code in SceneObjectPart for subscribing toRobert Adams2013-07-111-54/+43
| | | | | | | | | | collision events. Improve logic for knowing when to add processing routine to physics actor.
| * minor: remove some regression test logging switches accidentally left ↵Justin Clark-Casey (justincc)2013-07-111-1/+1
| | | | | | | | uncommented.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-093-9/+4
| |\
| | * minor: remove mono compiler warnings related to keyframe codeJustin Clark-Casey (justincc)2013-07-082-8/+3
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-0/+4
| | |\
| | * | 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
| * | | Put guards on a bunch of exception-inducing code, as seen in logs from load ↵Diva Canto2013-07-093-2/+11
| | |/ | |/| | | | | | | test.
| * | Try to normalize the creatorData of scene object parts with the trailing ↵Diva Canto2013-07-061-0/+4
| |/ | | | | | | '/'. What a nightmare this '/' is!
| * refactor: Make stats and sim status simpler by extending BaseStreamHandler ↵Justin Clark-Casey (justincc)2013-07-061-20/+6
| | | | | | | | like other handlers instead of implementing the IStreamedRequestHandler interface directly
| * Add very basic regression test TestChildAgentSingleRegionCapabilities() ↵Justin Clark-Casey (justincc)2013-07-051-0/+88
| | | | | | | | which checks for addition and removal of capabilities on add/remove of child agent
| * Throttle the viewer's requests for region handles. Apparently Kokua is ↵Diva Canto2013-07-041-18/+0
| | | | | | | | requesting this for all landmarks in inventory. Not sure why. But this seems to be the root cause of the login freeze mentioned before. This commit adds a blocking queue / process thread pattern.
* | Merge branch 'master' into careminsterMelanie2013-07-042-23/+1
|\ \ | |/
| * Debug the RegionHandle handler (same issue)Diva Canto2013-07-041-0/+1
| |
| * change "debug packet" command to "debug lludp packet" to conform with other ↵Justin Clark-Casey (justincc)2013-07-041-23/+0
| | | | | | | | | | | | | | "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
* | Merge branch 'master' into careminsterMelanie2013-06-304-22/+66
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Add materials store null check into UuidGatherer code.Justin Clark-Casey (justincc)2013-06-281-0/+4
| |
| * Reinsert code for gathering uuids reference by materials back directly into ↵Justin Clark-Casey (justincc)2013-06-282-30/+99
| | | | | | | | | | | | | | 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.
| * refactor: Move code for gathering textures referenced by materials into ↵Justin Clark-Casey (justincc)2013-06-272-67/+33
| | | | | | | | | | | | 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-272-9/+11
| | | | | | | | | | | | | | | | 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.
| * Improve situation where editing just the root prim of an attachment causes ↵Justin Clark-Casey (justincc)2013-06-251-1/+10
| | | | | | | | | | | | | | other prims to be set to very far off positions on reattach. Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334 However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
| * Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 ↵Justin Clark-Casey (justincc)2013-06-251-10/+4
| | | | | | | | structs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-231-5/+5
| |\
| | * Fix other places when saving scripts or notecards in prim inventories where ↵Justin Clark-Casey (justincc)2013-06-181-5/+5
| | | | | | | | | | | | messages should be transient without an OK button
* | | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \ \ | |/ /
| * | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| |/
* | Merge branch 'master' into careminsterMelanie2013-06-134-3/+14
|\ \ | |/
| * * This fixes having to select and deselect prim to get keyframemotion to ↵teravus2013-06-121-0/+5
| | | | | | | | start running when pulled from data storage.
| * Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-113-3/+9
| | | | | | | | | | | | or removed. Shouldn't impact anyone as only DSG seems to use OnScenePresenceUpdated event. Some minor format changes to AnimationSet's ToString().
* | Merge branch 'master' into careminsterMelanie2013-06-111-2/+3
|\ \ | |/
| * * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ↵teravus2013-06-111-2/+3
| | | | | | | | | | | | | | there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this. * Has a prim table migration.. that might take a while, hold on to your hats. * Fixes a null-ref when shutting down while keyframed motion is active.
generated by cgit v1.1 at 2024-09-12 15:18:46 +0000