aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2144-1033/+2889
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' into careminsterMelanie2014-01-289-280/+367
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-14/+30
| | | | | | | | | | | | Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
| | * refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which ↵Justin Clark-Casey (justincc)2014-01-271-2/+1
| | | | | | | | | | | | occur no matter which branch of the conditional is executed
| | * Add back code to UuidGatherer to retrieve UUIDs for materials stored in ↵dahlia2014-01-201-0/+73
| | | | | | | | | | | | DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-201-0/+7
| | |\
| | | * Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | removed, when a script is removed, or when a script is reset. Also added a stats command to track the number of json stores used by a region. Will probably add some more commands later.
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-202-15/+154
| | |\ \ | | | |/ | | |/|
| | | * Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-202-15/+154
| | | | | | | | | | | | | | | | been deleted or has no spawn points.
| | * | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-202-97/+53
| | | | | | | | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
| | * | minor: reinsert some method doc back into IEntityTransferModuleJustin Clark-Casey (justincc)2014-01-171-0/+20
| | | |
| | * | Reorder checks in SP.CompleteMovement() to fix test failuresJustin Clark-Casey (justincc)2014-01-161-36/+33
| | | |
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-162-57/+68
| | |\ \ | | | |/
| | | * Actually put IsChildAgent = true inside the lock, otherwise there is still a ↵Justin Clark-Casey (justincc)2014-01-161-1/+3
| | | | | | | | | | | | | | | | small window for race conditions on duplicate CompleteMovement calls
| | | * Prevent duplicate invocations or race dontision in SP.CompleteMovement()Justin Clark-Casey (justincc)2014-01-162-56/+65
| | | | | | | | | | | | | | | | | | | | This can happen under poor network conditions if a viewer repeats the message send If this happens, physics actors can get orphaned, which unecessarily raises physics frame times
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-162-123/+0
| | |\ \ | | | |/
| | | * Remove old IInterRegionComms and references. This hasn't been used since ↵Justin Clark-Casey (justincc)2014-01-162-123/+0
| | | | | | | | | | | | | | | | 2009 and was superseded by ISimulationService
| * | | Merge branch 'master' into careminsterMelanie2014-01-285-50/+95
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-5/+5
| | |\ \ | | | |/
| | | * When moving the root prim of an attachment: a) Change the attach position; ↵Oren Hurvitz2014-01-101-5/+5
| | | | | | | | | | | | | | | | b) Move the other prims in the reverse direction to compensate
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-104-71/+92
| | |\ \ | | | |/
| | | * Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-102-14/+14
| | | | | | | | | | | | | | | | its main permissions
| | | * Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-103-57/+78
| | | | | | | | | | | | | | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-081-0/+2
| | |\ \ | | | |/
| | | * If an agent is sitting, then do send the rotation in the agent update ↵Justin Clark-Casey (justincc)2014-01-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of zeroing it to resolve mouselook camera problems Addresses http://opensimulator.org/mantis/view.php?id=6892 Thanks to tglion for this spot. This resolves a recent regression from 17b32b764acd815400d9eb903aaec6dcebd60ac7
| * | | Intermediate commit. Sill errors.Melanie2014-01-058-36/+79
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * | Some missing definitions needed for successful compilation.Robert Adams2014-01-041-1/+2
| | | |
| | * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-042-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-163-15/+39
| | |\ \
| | | * \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-3/+12
| | | |\ \ | | | | |/
| | | | * Wrap analysis of the particle system in the UUID Gatherer in a separate ↵Justin Clark-Casey (justincc)2013-12-141-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try/catch as sometimes it appears that this can be corrupt. As per Oren's suggestion.
| | | * | Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and ↵Justin Clark-Casey (justincc)2013-12-141-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NPC tests until positions are known to be stable. Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
| | | * | Fix build break in test from previous commit 54cc229 - hadn't realized ↵Justin Clark-Casey (justincc)2013-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | ScenePresence inst var name was slightly different
| | | * | Fix TestSitAndStandWithNoSitTarget NPC and SP tests.Justin Clark-Casey (justincc)2013-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | These stopped working because current code calculates sit heights based on avatar physics rather than appearance data. Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
| | | * | Eliminate unnecessary line from my previous commit 1d605642Justin Clark-Casey (justincc)2013-12-131-2/+0
| | | | |
| | | * | Refix sitting on child prims by reinserting relevant code back into ↵Justin Clark-Casey (justincc)2013-12-111-3/+22
| | | | | | | | | | | | | | | | | | | | SP.HandleAgentSit()
| | * | | This is the acutal sitting avatar crossing code. This commit implements theMelanie2013-12-161-2/+152
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | actual crossing mechanics for seated avatars, using the supporting code from the previous commits. Physics is not supported yet, although some few bits for them are already in place due to the earlier code drops. With this commit, crossing sitting avatar by "editing" the prim across the border, by using llSetPos or keyframe motion may already be possible. Vehicles will come next.
| | * | Replace proprietary file header with BSD oneMelanie2013-12-111-6/+27
| | | |
| | * | Add missing files *blush*Melanie2013-12-111-0/+19
| | | |
| | * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-113-354/+713
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
| | * | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-111-22/+10
| | |/ | | | | | | | | | | | | but I don't know if it runs. Will probably crash and burn as the supporting code isn't there yet.
| * | Merge branch 'master' into careminsterMelanie2013-12-072-99/+183
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Fix regression where mouse look flight direction no longer worked by zeroing ↵Justin Clark-Casey (justincc)2013-12-051-13/+2
| | | | | | | | | | | | | | | | | | | | | x/y rot before sending agent updates, instead of before any agent update processing It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook. Doing this in the terse send so that we preserve mouselook rotation information
| | * Ignore X and Y body rotations when sent by mouse look.Justin Clark-Casey (justincc)2013-12-031-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes http://opensimulator.org/mantis/view.php?id=3274 When not in mouselook, avatar only sends rotations around the Z plane (since that's the only way an avatar can rotate). However, in mouselook it also sends X and Y information. But sending X and Y in terse updates causes issues with wrong camera movement in mouselook. So strip out X and Y components for now. If this is an issue, then could strip out before sending avatar terse update, though this generates more cpu work. Thanks to mirceakitsune for suggesting an initial fix
| | * Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced ↵Justin Clark-Casey (justincc)2013-11-301-1/+1
| | | | | | | | | | | | for slow walk/run in 4cfe02a rather than the magic number
| | * Remove unused SP.Updated flag, which appears unused for many years and was ↵Justin Clark-Casey (justincc)2013-11-301-10/+0
| | | | | | | | | | | | only set true once and never reset
| | * Implement most effects of AGENT_CONTROL_STOPJustin Clark-Casey (justincc)2013-11-302-44/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AGENT_CONTROL_STOP is specified to SP.HandleAgentUpdate if the user holds down the space bar on a viewer. For a stopped avatar, this prevents fly or walk/run (though not rotate) until released. For a walking/running avatar, this reduces movement to half speed. For a flying avatar, this stops the avatar. These are observed behaviours on the LL grid - there was no previous OpenSimulator implementation This commit introduces an optional parameter to SP.AddNewMovement(), which means that it will no longer compile on .NET 3.5 or earlier versions of Mono than 2.8 Currently, this does not work for jumping, and if used whilst flying the avatar continues the fly animation even though it does not move
| | * Remove nudgehack from SP.HandleAgentUpdate by making MovementFlag a uint ↵Justin Clark-Casey (justincc)2013-11-301-19/+6
| | | | | | | | | | | | rather than a byte
| | * Remove unused sp.ParentPosition, which has not been used for some timeJustin Clark-Casey (justincc)2013-11-292-21/+2
| | |
| | * Comment out debug sit message accidently left activeJustin Clark-Casey (justincc)2013-11-291-3/+3
| | |
generated by cgit v1.1 at 2024-12-23 19:19:58 +0000