| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2013-01-23 | 1 | -4/+18 |
| |\ | |||||
| | * | Add accessors to allow serializing rot and position targets | Melanie | 2013-01-21 | 1 | -2/+12 |
| | | | |||||
| | * | Limit active at targets to 8 | Melanie | 2013-01-21 | 1 | -2/+6 |
| | | | |||||
| * | | Merge branch 'avination' | Melanie | 2013-01-19 | 1 | -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 terse | UbitUmarov | 2013-01-16 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-01-13 | 1 | -16/+3 |
| |\ \ | |/ | |||||
| | * | remove redundant lastPhysGroupPos and lastPhysGroupRot checks | UbitUmarov | 2013-01-11 | 1 | -16/+3 |
| | | | | | | | | | in SOG Update(). rootpart does more complet checks | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -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-04 | 1 | -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 careminster | Melanie | 2012-12-21 | 1 | -0/+9 |
| |\ \ \ | |/ / | |||||
| | * | | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵ | Robert Adams | 2012-12-18 | 1 | -0/+9 |
| | | | | | | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 1 | -1/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Fix locking for good | Melanie | 2012-12-18 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-12-17 | 1 | -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 ↵ | teravus | 2012-12-15 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | root part to each of the child parts. | ||||
| | * | | | Fix locking objects | Melanie | 2012-12-16 | 1 | -1/+3 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-18 | 1 | -5/+13 |
| |\ \ \ | |/ / |/| / | |/ | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | BulletSim: experimentally remove unit displacement from prim border crossing ↵ | Robert Adams | 2012-12-16 | 1 | -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() | UbitUmarov | 2012-10-18 | 1 | -3/+4 |
| | | | |||||
| | * | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-18 | 1 | -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-27 | 1 | -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-26 | 1 | -26/+28 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -5/+10 |
| |\ \ | |||||
| | * | | actually remove the use of random on persist timmings | UbitUmarov | 2012-11-02 | 1 | -4/+6 |
| | | | | |||||
| | * | | Create a new random when needed using normal time based seed instead of | UbitUmarov | 2012-11-02 | 1 | -2/+5 |
| | | | | | | | | | | | | | reusing a shared one than may not be valid | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-10-28 | 1 | -3/+17 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | ||||
| | * | | Add a property to determine if a link set is stored in the database. Also, fix | Melanie | 2012-10-28 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | a bug where "Force object permissive" god action would fail to reset child prim permissions. | ||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-10-19 | 1 | -3/+4 |
| | |\ \ | |||||
| | | * | | extend coment to include all unused SOG CheckSculptAndLoad() | UbitUmarov | 2012-10-18 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | ||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-10-17 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |||||
| | | * | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | now | ||||
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-17 | 1 | -0/+15 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fix perms when linking an object. Set root part perms to the perms | Melanie | 2012-10-14 | 1 | -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 "force | Melanie | 2012-10-08 | 1 | -0/+8 |
| | |/ / | | | | | | | | | | permissive" is used. | ||||
| * | | | Remove a core undo call that we don't need. | Melanie | 2012-09-27 | 1 | -2/+0 |
| | | | | |||||
| * | | | Make it possible to rescale SOGs when they are not in a scene. | Justin Clark-Casey (justincc) | 2012-09-27 | 1 | -23/+30 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -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-12 | 1 | -7/+8 |
| | | | | | | | | | | | | | 783ee949 | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 1 | -1/+5 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into | Melanie | 2012-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | it's own sub-method | ||||
| | * | | move keyframemotion.copy from sop.copy to sog.copy, where there is | UbitUmarov | 2012-08-30 | 1 | -0/+4 |
| | | | | | | | | | | | | | newgroup information avaiable. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 1 | -0/+18 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | implementing per-region configuration of limits on the number of prims one ↵ | SignpostMarv | 2012-09-09 | 1 | -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 rezzing | Melanie | 2012-08-24 | 1 | -3/+15 |
| | | | | | | | | | | | | | Port from Avination | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-31 | 1 | -7/+17 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-08-30 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-08-29 | 1 | -5/+22 |
| | | |\ \ | |||||
| | | * | | | Fix a nullref while object is being created | Melanie | 2012-08-28 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacing | UbitUmarov | 2012-08-30 | 1 | -10/+2 |
| | | |/ / | |/| | | | | | | | | | | | | | | fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |