| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | | * | | BulletSim: add terrain contact processing threshold parameter. Initialize ↵ | Robert Adams | 2013-03-19 | 4 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | contact processing threshold for static object as well as mesh terrain. | |||||
| | | | * | | Process default attachment point in AttachObjectInternal before we check ↵ | Justin Clark-Casey (justincc) | 2013-03-19 | 1 | -27/+27 | |
| | | | | | | | | | | | | | | | | | | | | | whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach. | |||||
| | | | * | | Fix tests for multiattach | Melanie | 2013-03-18 | 2 | -6/+6 | |
| | | | | | | ||||||
| | | | * | | Merge branch 'master' into newmultiattach | Melanie | 2013-03-18 | 39 | -580/+1466 | |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||||
| | | | * \ \ | Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach | Melanie | 2013-03-18 | 1 | -139/+167 | |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||||
| | | | * | | | | Limit each attachment point to 5 items as per spec | Melanie | 2013-03-18 | 1 | -3/+13 | |
| | | | | | | | | ||||||
| | | | * | | | | Multiattach, part 1 | Melanie | 2013-03-18 | 6 | -38/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | | | | | Fix SceneManager to use the new automatic property throughout. | Melanie | 2013-03-21 | 1 | -3/+2 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge branch 'avination' into careminster | Melanie | 2013-03-19 | 2 | -12/+37 | |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ↵ | teravus | 2013-03-16 | 1 | -11/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | SceneRaycast call doesn't have a filter option in the interface and physics will use the lower level one for all sorts of goodies so it wouldn't be appropriate to ignore it at the physics layer yet.. though that would be better once the API has filters. | |||||
| | | * | | | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵ | root | 2013-03-16 | 1 | -2/+2 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | avination | |||||
| | | * | | | | | Fix case where the string member of a LSL_String in a list is null | root | 2013-03-16 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Fix merge artefacts | Melanie | 2013-03-19 | 2 | -6/+6 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster | Melanie | 2013-03-19 | 2 | -143/+351 | |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||||
| | | * | | | | | Improve rejection of any attempt to reattach an object that is already attached. | Justin Clark-Casey (justincc) | 2013-03-18 | 2 | -31/+194 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects. | |||||
| | | * | | | | | Fix recent regression where an item worn to an attachment point that was ↵ | Justin Clark-Casey (justincc) | 2013-03-18 | 2 | -89/+153 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already occupied did not remove the previous attachment (current behaviour) Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013) Added regression test for this case. | |||||
| | | * | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-03-17 | 2 | -16/+22 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | Make the LSL memory functions virtual so script engines can override them if ↵ | Melanie | 2013-03-15 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they have different memory management. | |||||
| | * | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster | Melanie | 2013-03-19 | 2 | -16/+22 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | | BulletSim: add INI parameter for angular banking timescale fudge parameter. | Robert Adams | 2013-03-16 | 2 | -7/+12 | |
| | | | | | | | | | ||||||
| | | * | | | | | | BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL ↵ | Vegaslon | 2013-03-16 | 1 | -16/+17 | |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis) Signed-off-by: Robert Adams <Robert.Adams@intel.com> | |||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 11 | -176/+233 | |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | | | | | BulletSim: Tweak vertical angular attraction to remove double ↵ | Vegaslon | 2013-03-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side. Signed-off-by: Robert Adams <Robert.Adams@intel.com> | |||||
| | | * | | | | | Fix server statistics always reporting zero for total network bytes in/out. | Robert Adams | 2013-03-15 | 2 | -34/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up some parameter code in Statistics.Binary. | |||||
| | | * | | | | | Add example code to DOExampleModule to pull data from that previously saved ↵ | Justin Clark-Casey (justincc) | 2013-03-15 | 2 | -5/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by DAExampleModule when instantiating a dynamc object. | |||||
| | | * | | | | | Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is ↵ | Justin Clark-Casey (justincc) | 2013-03-15 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary to get attributes to save (though this probably happens anyway due to the prim move) | |||||
| | | * | | | | | refactor: make llGetLinkName() and llGetLinkKey() use a common ↵ | Justin Clark-Casey (justincc) | 2013-03-15 | 1 | -84/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetLinkEntity() method | |||||
| | | * | | | | | minor: remove mono compiler warnings in LSL_Api.cs | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| | | * | | | | | Log same environment information to Robust log as is already done for ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 2 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simulator logs, for debug purposes | |||||
| | | * | | | | | refactor: minor cleanup in osGetAvatarList() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix bug in osCauseHealing() if called with an avatar ID for an avatar that ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -13/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not in the scene. | |||||
| | | * | | | | | minor: Use more compact libomv primitive constructors in osNpcGetPos() and ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -6/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osNpcGetRot() | |||||
| | | * | | | | | Fix minor race conditions in OSSL_Api functions where a parcel could be ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -6/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | misidentified for moving prims. | |||||
| | | * | | | | | refactor: Use LSL_Vector(Vector3) constructor in llCastRay() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -41/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | having to continually take intermediate Vector3s to avoid race conditions | |||||
| | | * | | | | | Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 2 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method | |||||
| | | * | | | | | Fix minor race condition in llGetCameraRot() where inconsistent information ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could be returned for a rotating camera | |||||
| | | * | | | | | Fix minor race condition in llGetCameraPos() where an inconsistent post ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could be returned for a moving camera | |||||
| | | * | | | | | Fix minor race condition in llParcelMediaCommandList() where a parcel could ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be misidentified for a moving prim | |||||
| | | * | | | | | Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -10/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PRIM_SIZE and PRIM_ROT_LOCAL This function is used by all the various ll*Params() and os*Params() functions | |||||
| | | * | | | | | Fix minor race condition in llGetGeometricCenter() if this was changing ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whilst the function was called. | |||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-14 | 7 | -56/+251 | |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||||
| | | * | | | | | refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix minor race condition in llGetRootPosition() where inconsistent results ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could be returned for moving prims | |||||
| | | * | | | | | Fix minor race conditions in detecting current parcel for ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims | |||||
| | | * | | | | | refactor: use LSL_Vector(Vector3) constructor in llGroundNormal() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one. | |||||
| | | * | | | | | Fix minor race conditions in llTeleportAgent(), ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -14/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars. | |||||
| | | * | | | | | refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix a minor race condition in llInstantMessage() where slightly wrong origin ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | co-ordinates could be given for a fast moving prim | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |