aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, soUbitUmarov2014-07-221-91/+86
| | | | revert previus change assuming it didnt. remove a no longer needed else {}
* consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE andUbitUmarov2014-07-221-0/+2
| | | | RETURN_AT_EDGE from simulation
* make ResetChildPrimPhysicsPositions only do what it is supposed to do andUbitUmarov2014-07-221-1/+11
| | | | not what AbsolutePosition does
* tell scripts about positions changes after they are actually changedUbitUmarov2014-07-221-10/+18
|
* dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sogUbitUmarov2014-07-221-84/+96
|
* bug fix. Child position got broken because first prim i parts array mayUbitUmarov2014-07-221-0/+5
| | | | not be the root prim
* send updates on selected attachments as sl ( warinin if reverted then aUbitUmarov2014-07-221-3/+3
| | | | fix is needed elsewhere since the changes are never sent)
* change presence movetotarget avoiding trying to go undergroud or fly whenUbitUmarov2014-07-211-1/+4
| | | | it can walk. ( still needs better code )
* make sittarget camera relative to root primUbitUmarov2014-07-201-17/+18
| | | | Please enter the commit message for your changes. Lines starting
* another change to standupUbitUmarov2014-07-201-1/+1
|
* change avatar standup codeUbitUmarov2014-07-201-28/+25
|
* physicsSit SendSitResponse also relative to parent primUbitUmarov2014-07-201-5/+11
|
* physics engine cannot change internal positions of linksets, at least notUbitUmarov2014-07-201-2/+2
| | | | in teaseupdates
* replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-203-11/+9
| | | | artifacts
* Merge branch 'avination-current'Melanie Thielker2014-07-191-15/+64
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2014-07-162-17/+19
| |\ | | | | | | | | | into avination-current
| * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2013-09-197-17/+26
| |\ \ | | | | | | | | | | | | into avination-current
| * | | keyframe: add more locks, change timming stop, added Suspend and resumeUbitUmarov2013-06-061-15/+64
| | | |
* | | | fix attachmentsUbitUmarov2014-07-191-7/+9
| | | |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2132-896/+2740
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * | | Merge branch 'master' into careminsterMelanie2014-01-286-161/+340
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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'.
| | * | | | 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-161-12/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Remove old IInterRegionComms and references. This hasn't been used since ↵Justin Clark-Casey (justincc)2014-01-161-12/+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-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
generated by cgit v1.1 at 2025-02-08 08:20:07 +0000