aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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-056-26/+47
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Committing the Avination Scene Presence and related texture codeMelanie2013-12-112-352/+709
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | 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
| | | | |
| | * | | Fix regression where sitting on ground stopped working.Justin Clark-Casey (justincc)2013-11-291-8/+11
| | | | | | | | | | | | | | | | | | | | This was due to the PhysicsActor no longer being recreated on stand from ground.
| | * | | Restore SP.AbsolutePosition to properly return actual absolute position when ↵Justin Clark-Casey (justincc)2013-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | sitting
| | * | | Fix stand positions rather than having the stand jump to the root prim.Justin Clark-Casey (justincc)2013-11-271-7/+49
| | | | |
| | * | | Only translate linked prim specified offset pos by the link prim rotation, ↵Justin Clark-Casey (justincc)2013-11-261-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not any specified avatar rotation as well. Don't translate root prim position by avatar rotation.
| | * | | fix position changes when sitting on a prim with position and/or orientation ↵Justin Clark-Casey (justincc)2013-11-261-3/+28
| | | | | | | | | | | | | | | | | | | | explicitly specified
| * | | | Merge branch 'master' into careminsterMelanie2013-11-233-3/+74
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * | | | Revert "Fix issue where sitting on non-root linked prims would send camera ↵Justin Clark-Casey (justincc)2013-11-231-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to wrong position in third-person and mouselook" Reverting to place on separate branch This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
| | * | | | Revert "Add line accidentally left out of recent non-root prim sit fix"Justin Clark-Casey (justincc)2013-11-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting to place on new branch This reverts commit ed1029712a85206430fee1d4897d473517728dab.
| | * | | | Revert "Fix non-root prim sit positions for prims where a sit target has ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | been specified as well." Revert to place on separate branch for now This reverts commit 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.
| | * | | | Revert "Refix fix for sitting on non-root linked prims with explicit sit ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | targets." This reverts commit 78649eb0999a5f97cc541c94ec98d1d06ed957cb.
| | * | | | Revert "fix avatar rotation when sitting on a linked part"Justin Clark-Casey (justincc)2013-11-231-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Reverting for now to place on separate branch This reverts commit 65304260af283211443a2872c46f6609d3e45649.
| | * | | fix avatar rotation when sitting on a linked partJustin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
| | * | | Refix fix for sitting on non-root linked prims with explicit sit targets.Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
| | * | | Fix non-root prim sit positions for prims where a sit target has been ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | specified as well.
| | * | | Add line accidentally left out of recent non-root prim sit fixJustin Clark-Casey (justincc)2013-11-231-0/+2
| | | | | | | | | | | | | | | | | | | | Original commit is ff4e7de7
| | * | | Fix issue where sitting on non-root linked prims would send camera to wrong ↵Justin Clark-Casey (justincc)2013-11-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position in third-person and mouselook We now specify sits as offsets from the root prim, as the viewer expects.
| | * | | refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-152-3/+3
| | | | | | | | | | | | | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
| | * | | Fix bug where removing a physical linkset would only decrement the Active ↵Justin Clark-Casey (justincc)2013-11-132-2/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objects statistic by 1 instead of by the number of prims removed. Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest. Added regression test for this case.
| * | | | Merge branch 'master' into careminsterMelanie2013-11-034-79/+175
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | After finishing to edit an attachment, let other avatars see the changes. ↵Oren Hurvitz2013-10-172-8/+4
| | | | | | | | | | | | | | | | | | | | (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
generated by cgit v1.1 at 2024-12-23 07:15:47 +0000