| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 1 | -21/+33 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | ||||
| | * | Merge branch 'ubitwork' into avination | Melanie | 2012-10-17 | 1 | -21/+33 |
| | |\ | |||||
| | | * | normalize quaternion.Slerp outputs | UbitUmarov | 2012-10-10 | 1 | -0/+1 |
| | | | | |||||
| | | * | bug fix + make costs visible for testing | UbitUmarov | 2012-10-07 | 1 | -4/+9 |
| | | | | |||||
| | | * | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-07 | 1 | -17/+21 |
| | | | | | | | | | | | | | now | ||||
| | | * | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled | UbitUmarov | 2012-10-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | for all physics engines) | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-10-17 | 1 | -14/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Fix perms when linking an object. Set root part perms to the perms | Melanie | 2012-10-14 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | 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 | -2/+2 |
| | |/ | | | | | | | permissive" is used. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ↵ | Dan Lake | 2012-10-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | update. There should be a better way to indicate which properties have changed that is non LLUDP-centric | ||||
| | * | | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini. | Justin Clark-Casey (justincc) | 2012-09-27 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Don't store undo states if a scene object is manipulated when it is not in a ↵ | Justin Clark-Casey (justincc) | 2012-09-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | scene. Adds regression test for this. | ||||
| | * | | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting. | Justin Clark-Casey (justincc) | 2012-09-26 | 1 | -45/+43 |
| | | | | |||||
| | * | | Make it possible to rescale SOGs when they are not in a scene. | Justin Clark-Casey (justincc) | 2012-09-26 | 1 | -8/+12 |
| | | | | |||||
| | * | | Enforce existing 5 action hardcoded undo limit. | Justin Clark-Casey (justincc) | 2012-09-26 | 1 | -26/+33 |
| | | | | | | | | | | | | | | | | | | | | | | This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source. This commit enforces that limit, which will soon become configurable. Regression test for undo limit added Should help with http://opensimulator.org/mantis/view.php?id=6279 | ||||
| | * | | Add basic undo/redo regression tests. | Justin Clark-Casey (justincc) | 2012-09-26 | 1 | -6/+6 |
| | | | | |||||
| | * | | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-24 | 1 | -0/+21 |
| | | | | | | | | | | | | | Port from Avination | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -4/+4 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing. | Melanie | 2012-09-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | We can't put it back so we don't need to know. | ||||
| * | | | Make it possible to rescale SOGs when they are not in a scene. | Justin Clark-Casey (justincc) | 2012-09-27 | 1 | -8/+12 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 1 | -2/+2 |
| |\ \ \ | |/ / | |||||
| | * | | move keyframemotion.copy from sop.copy to sog.copy, where there is | UbitUmarov | 2012-08-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | newgroup information avaiable. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-31 | 1 | -1/+7 |
| |\ \ \ | |/ / | |||||
| | * | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacing | UbitUmarov | 2012-08-30 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | 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. | ||||
| | * | | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing... | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-24 | 1 | -0/+21 |
| |\ \ \ | |/ / | |||||
| | * | | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-23 | 1 | -0/+21 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 1 | -13/+30 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | refactoring out SetFaceColor | SignpostMarv | 2012-08-20 | 1 | -52/+15 |
| | | | | |||||
| | * | | making use of implicit operators and Util.Clip handling of Vector3 | SignpostMarv | 2012-08-20 | 1 | -21/+26 |
| | | | | |||||
| | * | | single operation for PRIM_COLOR | SignpostMarv | 2012-08-20 | 1 | -0/+49 |
| | | | | |||||
| | * | | fix typo | SignpostMarv | 2012-08-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 1 | -8/+58 |
| |\ \ \ | |/ / | | / | |/ |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | fixing bug that get/set the wrong property for prim types other than sphere ↵ | SignpostMarv | 2012-08-17 | 1 | -1/+2 |
| | | | | | | | | | & box | ||||
| | * | implemented | SignpostMarv | 2012-08-17 | 1 | -0/+50 |
| | | | |||||
| | * | Correct an exception report in SceneObjectPart so it outputs the stack. | Robert Adams | 2012-08-15 | 1 | -1/+1 |
| | | | |||||
| | * | enables configurable minimum sizes for physical & non-physical prims | SignpostMarv | 2012-08-15 | 1 | -7/+6 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵ | SignpostMarv | 2012-08-03 | 1 | -1/+1 |
| | | | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer | ||||
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 1 | -29/+171 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 1 | -8/+19 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| | | * | Many explanitory comments added to the link and delink code in | Robert Adams | 2012-07-11 | 1 | -8/+20 |
| | | | | | | | | | | | | | SOG and SOP. Should have no functionality changes. | ||||
| | * | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 1 | -22/+57 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | ||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -7/+122 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | | * | | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | and SOP.RemoveSittingAvatar() | ||||
| | | * | | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability" | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2. On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly | ||||
| | | * | | refactor: Add SOP.IsSitTargetOccupied to improve readability | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -1/+6 |
| | | | | | |||||
| | | * | | Move common code to detect whether a part has a valid sit target into a SOP ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property rather than being repeated in SP. This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical. Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero. | ||||
| | | * | | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |