| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 1 | -3/+6 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| | * | minor: If the physics module tells us that an object has gone out of bounds, ↵ | Justin Clark-Casey (justincc) | 2012-12-15 | 1 | -2/+5 |
| | | | | | | | | | more helpfully log the name, id, position and region of that object. | ||||
| | * | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ↵ | Justin Clark-Casey (justincc) | 2012-12-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | causing subsequent issues if physics was re-enabled. Added regression tests Addresses http://opensimulator.org/mantis/view.php?id=6365 | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Make sure we're not accessing a physics scene if we're not in one yet. | Melanie | 2012-10-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Put back the collision sound shim into SOP | Melanie | 2012-10-30 | 1 | -0/+29 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 1 | -152/+0 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | shuffling code around so that the interface for ISoundModule.SendSound() ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | specifies a UUID rather than a string | ||||
| | * | | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 1 | -79/+9 |
| | | | | |||||
| | * | | fixing a bug in SceneObjectPart.SendSound where sounds would always come ↵ | SignpostMarv | 2012-10-29 | 1 | -9/+8 |
| | | | | | | | | | | | | | from the root prim rather than the source prim | ||||
| | * | | Factoring out a superfluous local variable & repeated assignment in ↵ | SignpostMarv | 2012-10-29 | 1 | -10/+8 |
| | | | | | | | | | | | | | SceneObjectPart.SendSound as linksets are only meant to have a single owner | ||||
| | * | | removing superfluous lines from SceneObjectPart.SendSound | SignpostMarv | 2012-10-29 | 1 | -8/+0 |
| | | | | |||||
| | * | | transposing preload sound onto sound module | SignpostMarv | 2012-10-29 | 1 | -31/+0 |
| | | | | |||||
| | * | | formatting changes to SceneObjectPart.SendSound; consistent indentation | SignpostMarv | 2012-10-29 | 1 | -34/+34 |
| | | | | |||||
| | * | | SceneObjectPart.SendSound can exit early if a sound module was not found. | SignpostMarv | 2012-10-29 | 1 | -4/+4 |
| | | | | |||||
| | * | | Changing the logic order in the TaskInventory iterator of ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first. | ||||
| | * | | Replacing double-if block in SceneObjectPart.SendSound with Util.Clip | SignpostMarv | 2012-10-29 | 1 | -4/+1 |
| | | | | |||||
| | * | | normalize quaternion.Slerp outputs | UbitUmarov | 2012-10-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | Remove extraneous calls to the now commented CheckSculptAndLoad | Melanie | 2012-10-18 | 1 | -24/+0 |
| | | | | |||||
| | * | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-18 | 1 | -12/+16 |
| | | | | | | | | | | | | | | | | | | | now Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | 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 |
| | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |