aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-147-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-141-1/+2
| |
| * Fix minor race condition in llGetRootPosition() where inconsistent results ↵Justin Clark-Casey (justincc)2013-03-141-2/+2
| | | | | | | | could be returned for moving prims
| * Fix minor race conditions in detecting current parcel for ↵Justin Clark-Casey (justincc)2013-03-141-3/+7
| | | | | | | | llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims
| * refactor: use LSL_Vector(Vector3) constructor in llGroundNormal()Justin Clark-Casey (justincc)2013-03-141-1/+1
| |
| * minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new ↵Justin Clark-Casey (justincc)2013-03-141-1/+6
| | | | | | | | one.
| * Fix minor race conditions in llTeleportAgent(), ↵Justin Clark-Casey (justincc)2013-03-141-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-141-2/+2
| |
| * Fix a minor race condition in llInstantMessage() where slightly wrong origin ↵Justin Clark-Casey (justincc)2013-03-141-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-141-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-141-1/+2
| | | | | | | | changing angular velocity could return inconsistent results
| * refactor: Use LSL_Vector(Vector3) constructor in llGetVel()Justin Clark-Casey (justincc)2013-03-141-1/+1
| |
| * refactor: Use LSL_Vector(Vector3) constructor in llGetTorque()Justin Clark-Casey (justincc)2013-03-141-2/+2
| |
| * Fix minor race condition in llGetLocalRot() where inconsistent results could ↵Justin Clark-Casey (justincc)2013-03-141-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-141-3/+4
| | | | | | | | LSL_Api.GetPartRot()
| * Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use ↵Justin Clark-Casey (justincc)2013-03-143-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 avatarJustin Clark-Casey (justincc)2013-03-142-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-131-8/+16
| | | | | | | | conditions with a serialization thread.
| * Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since ↵Justin Clark-Casey (justincc)2013-03-131-1/+0
| | | | | | | | this is being done lazily
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-132-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 careminsterMelanie2013-03-131-2/+2
|\ \
| * | Spot fix the interpenetration issue. Thanks, Ter.Melanie2013-03-121-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-137-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-131-0/+5
| | | | | | | | | | | | future debugging of VectorRenderModule
| * | minor: Remove mono compiler warning in LLClientViewJustin Clark-Casey (justincc)2013-03-131-1/+1
| | |
| * | Make C# scripts return correct error line and column numbers instead of ↵Justin Clark-Casey (justincc)2013-03-131-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-121-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.
| * | Improve teleport cancellation in some circumstances, though cancelling ↵Justin Clark-Casey (justincc)2013-03-122-34/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | teleports is still not recommended. Previously, hitting the cancel button on a teleport would cancel on the client side but the request was ignored on the server side. Cancel would still work if the teleport failed in the early stages (e.g. because the destination never replied to early CreateAgent and UpdateAgent messages). But if the teleport still completed after a delay here or later on, the viewer would become confused (usual symptom appears to be avatar being unable to move/reteleport). This commit makes OpenSimulator obey cancellations which are received before it sends the TeleportFinish event queue message and does proper cleanup. But cancellations received after this (which can happen even though the cancel button is removed as this messages comes on a different thread) can still result in a frozen avatar. This looks extremely difficult and impossible to fix. I can replicate the same problem on the Linden Lab grid by hitting cancel immediately after a teleport starts (a teleport which would otherwise quickly succeed).
| * | minor: remove mono compiler warning in SceneObjectUndoRedoTestsJustin Clark-Casey (justincc)2013-03-111-2/+2
| | |
| * | minor: Remove mono compiler warnings from LSL_ApiHttpTestsJustin Clark-Casey (justincc)2013-03-111-1/+0
| | |
| * | minor: Remove mono compiler warnings in EventQueueTestsJustin Clark-Casey (justincc)2013-03-111-1/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-115-23/+134
|\ \ \ | |/ /
| * | BulletSim: remove the ability for avatars to fly off the edge ofRobert Adams2013-03-094-23/+117
| | | | | | | | | | | | | | | regions when there are no region neighbors. Add some terrain location processing routines to support above.
| * | * Apparently, sometimes texture entries come in from the wire with no ↵teravus2013-03-081-0/+17
| | | | | | | | | | | | default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception.
* | | Merge branch 'master' into careminsterMelanie2013-03-0815-165/+342
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | * Just another one of those new packet blocks causing a null ref. ↵teravus2013-03-071-1/+1
| | | | | | | | | | | | Defaulting to zero length array.....
| * | minor: remove some completely unused string local vars added recently in ↵Justin Clark-Casey (justincc)2013-03-061-2/+0
| | | | | | | | | | | | commit 984faf2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-066-35/+147
| |\ \
| | * | Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-055-35/+143
| | | | | | | | | | | | | | | | | | | | functions into one for node type and one for value type. Define and export constants for both nodes and values.
| | * | Convert doubles passed back through the MOD interface into LSL_FloatsMic Bowman2013-03-051-0/+4
| | | |
| * | | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-063-8/+33
| | | | | | | | | | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
| * | | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-064-123/+166
| |/ / | | | | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode.
| * | Fix bug in osGetPrimitiveParams() so that it works for prims with the same ↵Justin Clark-Casey (justincc)2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | owner as the script and not ones with different owners. Addresses http://opensimulator.org/mantis/view.php?id=6560
* | | * Separate two if trees that got merged into one if tree with borked logic.teravus2013-03-061-2/+25
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-03-068-35/+49
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| | |
| * | Multiattach, part 1Melanie2013-03-056-34/+24
| | |
| * | Add support for void return typeroot2013-03-031-1/+5
| | |
| * | Experimental - add void return support to modSendCommandMelanie2013-03-031-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-057-162/+192
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
generated by cgit v1.1 at 2024-09-19 09:14:49 +0000