aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | |/
| * remove redundant lastPhysGroupPos and lastPhysGroupRot checksUbitUmarov2013-01-111-16/+3
| | | | | | | | in SOG Update(). rootpart does more complet checks
* | Merge branch 'master' into careminsterMelanie2013-01-041-6/+29
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix llGetLinkKey() to return the last sat avatar as the last link number.Justin Clark-Casey (justincc)2013-01-041-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/LlGetLinkKey This is done by keeping a scene-object wide list of sitters. This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim. This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists Addresses http://opensimulator.org/mantis/view.php?id=6477
* | | Merge branch 'master' into careminsterMelanie2012-12-211-0/+9
|\ \ \ | |/ /
| * | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵Robert Adams2012-12-181-0/+9
| | | | | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+3
|\ \ \ | | |/ | |/|
| * | Fix locking for goodMelanie2012-12-181-3/+3
| | |
| * | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-12-171-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | avination Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * | * Fix for Prim Locking. Prior to the merge, it was just a clone of the ↵teravus2012-12-151-4/+4
| | | | | | | | | | | | | | | | root part to each of the child parts.
| * | | Fix locking objectsMelanie2012-12-161-1/+3
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-12-181-5/+13
|\ \ \ | |/ / |/| / | |/ | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * BulletSim: experimentally remove unit displacement from prim border crossing ↵Robert Adams2012-12-161-2/+13
| | | | | | | | test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change.
| * extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| |
| * [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-181-2/+2
| | | | | | | | | | | | now Signed-off-by: Melanie <melanie@t-data.com>
| * Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-271-8/+0
| | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
| * Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-261-26/+28
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-171-5/+10
|\ \
| * | actually remove the use of random on persist timmingsUbitUmarov2012-11-021-4/+6
| | |
| * | Create a new random when needed using normal time based seed instead ofUbitUmarov2012-11-021-2/+5
| | | | | | | | | | | | reusing a shared one than may not be valid
* | | Merge branch 'avination' into careminsterMelanie2012-10-281-3/+17
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
| * | Add a property to determine if a link set is stored in the database. Also, fixMelanie2012-10-281-0/+13
| | | | | | | | | | | | | | | a bug where "Force object permissive" god action would fail to reset child prim permissions.
| * | Merge branch 'ubitwork' into avinationMelanie2012-10-191-3/+4
| |\ \
| | * | extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| | | |
* | | | Merge branch 'avination' into careminsterMelanie2012-10-181-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | | Merge branch 'ubitwork' into avinationMelanie2012-10-171-2/+2
| |\ \ \ | | |/ /
| | * | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-071-2/+2
| | | | | | | | | | | | | | | | now
* | | | Merge branch 'avination' into careminsterMelanie2012-10-171-0/+15
|\ \ \ \ | |/ / /
| * | | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-0/+7
| | | | | | | | | | | | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August.
| * | | Change permissions on child prim inventory items when god mode "forceMelanie2012-10-081-0/+8
| |/ / | | | | | | | | | permissive" is used.
* | | Remove a core undo call that we don't need.Melanie2012-09-271-2/+0
| | |
* | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-271-23/+30
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-161-7/+8
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Fix indentation and issues where tabs were used instead of spaces in commit ↵Justin Clark-Casey (justincc)2012-09-121-7/+8
| | | | | | | | | | | | 783ee949
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-1/+5
|\ \ \ | | |/ | |/|
| * | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-1/+1
| | | | | | | | | | | | it's own sub-method
| * | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-301-0/+4
| | | | | | | | | | | | newgroup information avaiable.
* | | Merge branch 'master' into careminsterMelanie2012-09-091-0/+18
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com>
| * | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-241-3/+15
| | | | | | | | | | | | Port from Avination