Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | Fix minor race condition in llGetOmega() where inconsistent results could be ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+2 |
| | | | | | | | | | | | | returned (accidentally stated that commit 1774c631 was this fix). Commit 1774c631 was actually a fix for a similar minor race condition in llGetAccel() | ||||
| * | Fix minor race condition in llGetOmega() where a call whilst a prim was ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+2 |
| | | | | | | | | changing angular velocity could return inconsistent results | ||||
| * | refactor: Use LSL_Vector(Vector3) constructor in llGetVel() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+1 |
| | | |||||
| * | refactor: Use LSL_Vector(Vector3) constructor in llGetTorque() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+2 |
| | | |||||
| * | Fix minor race condition in llGetLocalRot() where inconsistent results could ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+2 |
| | | | | | | | | be returned if the prim was rotating during the call | ||||
| * | refactor: use cleaner LSL_Rotation quaternion constructor in ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+4 |
| | | | | | | | | LSL_Api.GetPartRot() | ||||
| * | Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 3 | -10/+7 |
| | | | | | | | | the world rotation if the avatar to which they are attached is sitting | ||||
| * | Make llGetObjectDetails() return the correct world rotation for a sitting avatar | Justin Clark-Casey (justincc) | 2013-03-14 | 2 | -6/+36 |
| | | | | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=6567 This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation() SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting. | ||||
| * | Improve DAExampleModule to show current necessary locking to avoid race ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -8/+16 |
| | | | | | | | | conditions with a serialization thread. | ||||
| * | Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -1/+0 |
| | | | | | | | | this is being done lazily | ||||
| * | Add prototype dynamic objects map for scene object parts | Justin Clark-Casey (justincc) | 2013-03-13 | 2 | -0/+139 |
| | | | | | | | | | | | | | | | | | | This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes. This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes. This commit adds a DOExampleModule to demonstrate/evolve this code. Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap. DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later. These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-03-13 | 1 | -2/+2 |
|\ \ | |||||
| * | | Spot fix the interpenetration issue. Thanks, Ter. | Melanie | 2013-03-12 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-03-13 | 7 | -40/+185 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | ||||
| * | | minor: save some commented out log lines which will be useful again in ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -0/+5 |
| | | | | | | | | | | | | future debugging of VectorRenderModule | ||||
| * | | minor: Remove mono compiler warning in LLClientView | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -1/+1 |
| | | | |||||
| * | | Make C# scripts return correct error line and column numbers instead of ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | failing because they have no linemap. Adapted fix from http://opensimulator.org/mantis/view.php?id=6571 Thanks Nickel Briand | ||||
| * | | Add DisableInterRegionTeleportCancellation option in [EntityTransfer] ↵ | Justin Clark-Casey (justincc) | 2013-03-12 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | section of OpenSim.ini. False by default. This option allows the simulator to specify that the cancel button on inter-region teleports should never appear. This exists because sometimes cancellation will result in a stuck avatar requiring relog. It may be hard to prevent this due to the protocol design (the LL grid has the same issue) In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely. |