aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2013-06-071-1/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * | Fix regression where multiple close agents could be sent to the wrong ↵Justin Clark-Casey (justincc)2013-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | neighbour region on root agent close. This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013) Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously. Should address http://opensimulator.org/mantis/view.php?id=6658
* | | Merge branch 'master' into careminsterMelanie2013-06-061-3/+26
|\ \ \ | |/ /
| * | Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| | |
| * | Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-065-0/+64
| | | | | | | | | | | | may yield unexpected results in some cases. No database persistence yet,
| * | Committing Avination's Keyframe module. This is not hooked up yet and will ↵Melanie2013-06-061-0/+766
| | | | | | | | | | | | do nothing. More commits to follow.
| * | Avoid a deadlock where a script can attempt to take a ↵Justin Clark-Casey (justincc)2013-06-051-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order. This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless). The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region. This looks to address http://opensimulator.org/mantis/view.php?id=6557
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-066-2/+76
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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
| * | Unsit seated avatars when an object is deletedMelanie2013-06-021-0/+8
| | |
| * | Stop sending velocity to avoid snap-backMelanie2013-05-311-1/+1
| | |
| * | Allow Linden trees to preserve their type when taken into inventory and ↵Melanie2013-05-261-0/+5
| | | | | | | | | | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
| * | Port fix from justicc - decouple pay prices on drag-copied primsMelanie2013-05-241-0/+1
| | |
| * | Small adjustments to the floater moduleMelanie2013-05-131-1/+1
| | |
| * | Guard against trying to access terrain heights out of bounds. Clamp to sim.Melanie2013-05-111-1/+9
| | |
| * | Refactor to get closer to coreMelanie2013-05-111-1/+1
| | |
| * | Add RegionManager level and the ability to use literal XML to the dynamic ↵Melanie2013-05-042-0/+2
| | | | | | | | | | | | floater module
| * | Controller module for dynamic floaters (WIP)Melanie2013-04-271-0/+51
| | |
| * | Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-251-0/+57
| | | | | | | | | | | | compliant viewers
* | | Merge branch 'master' into careminsterMelanie2013-06-046-6/+184
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | Trigger OnScenePresenceUpdated when the avatar's animations change.Robert Adams2013-05-302-4/+21
| | |