aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* sitting avatars hidding by their position. This is not as SL that usesUbitUmarov2014-08-011-0/+5
| | | | | | avatar sitting on root prim. All cases have good and bad situations, this is simpler. Only SOG position changes triggers checks, rotation alone will not. ( as happens in other cases ) (UNTESTED, as usual )
* change how sounds work. May be bad.. needs testingUbitUmarov2014-07-271-2/+4
|
* clear script controls on crossing (untested)(possible should be doneUbitUmarov2014-07-261-0/+1
| | | | elsewhere/othe way)
* 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
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-211-25/+24
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' into careminsterMelanie2014-01-281-5/+8
| |\ | | | | | | | | | | | | | | | | | | | | | 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-101-0/+3
| | |\ \ | | | |/
| | | * Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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.)
| * | | Intermediate commit. Sill errors.Melanie2014-01-051-10/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | 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-111-0/+42
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
| * | Merge branch 'avination-current' into careminsterMelanie2013-09-161-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-06-301-10/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * | 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' into careminsterMelanie2013-06-231-2/+2
| |\ \ \ | | |/ /
| | * | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-06-131-0/+5
| |\ \ \ | | |/ /
| | * | * This fixes having to select and deselect prim to get keyframemotion to ↵teravus2013-06-121-0/+5
| | | | | | | | | | | | | | | | start running when pulled from data storage.
| | * | Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-061-0/+13
| | | | | | | | | | | | | | | | may yield unexpected results in some cases. No database persistence yet,
| * | | Merge branch 'avination-current' into careminsterMelanie2013-06-061-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-05-241-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
| | * | | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()Justin Clark-Casey (justincc)2013-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | As a struct, Vector3 has already been cloned by MemberwiseClone()
| | * | | Fix bug where a cloned object would report the wrong llGetNumberOfPrims() ↵Justin Clark-Casey (justincc)2013-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session. This was because the sitting avatars list was being cloned rather than reset. Addresses http://opensimulator.org/mantis/view.php?id=6649
| * | | | Merge branch 'master' into careminsterMelanie2013-05-111-7/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| | * | | remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-1/+1
| | | | |
| | * | | Fix issue where objects removed via llDie() would not disappear for users ↵Justin Clark-Casey (justincc)2013-05-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | looking in from neighbouring sims. This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason. Added regression test for this case. This fixes http://opensimulator.org/mantis/view.php?id=6627
| | * | | Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
| | * | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | | | Guard against Scene being null in attachments it the wearing avatar is in ↵Melanie Thielker2014-03-251-14/+16
| |_|_|/ |/| | | | | | | | | | | the process of logging out.
* | | | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-081-0/+1
| | | |
* | | | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| | | |
* | | | * This fixes having to select and deselect prim to get keyframemotion to ↵Melanie2013-06-131-0/+5
| |_|/ |/| | | | | | | | | | | | | | | | | | | | start running when pulled from data storage. Conflicts: OpenSim/Data/SQLite/SQLiteSimulationData.cs
* | | 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.
* | Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-311-1/+1
| | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'avination' into careminsterMelanie2013-01-231-4/+18
|\ \
| * | Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| | |
| * | Limit active at targets to 8Melanie2013-01-211-2/+6
| | |
* | | Merge branch 'avination'Melanie2013-01-191-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| * | dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-161-0/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-131-16/+3
|\ \ \ | |/ /