aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| | | | | | | | loads roots before children like MySQL does.
| * Try to fix sqlite breakageMelanie2012-05-151-0/+3
| |
| * Port Avination's collision fixes to core.Melanie2012-05-153-512/+188
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-144-514/+184
|\ \
| * | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-143-512/+178
| | |
| * | Check parcel entry permissions when moving objectsMelanie2012-05-141-1/+2
| | |
| * | Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-142-38/+147
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| | |
| * | Add configurable SpawnPointRoutingBlueWall2012-05-132-38/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use one of three selected methods to route avatar landing points when using Telehubs. The setting is in [Startup] using SpawnPointRouting = closest/random/sequence closest: The default setting. Routes avatar to the nearest SpawnPoint to the location. random: Picks random SpawnPoints to land the avatar. sequence: Follows a sequence to place the avatar on the next available SpawnPoint location Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
* | | Merge branch 'avination' into careminsterMelanie2012-05-133-4/+33
|\ \ \ | | |/ | |/|
| * | display a sleep time of zero if forced spare time to zero, when sim fps is ↵UbitUmarov2012-05-121-2/+7
| | | | | | | | | | | | lower than desired, for better display coerence.
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-122-2/+26
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-132-7/+33
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-102-7/+13
| |\ \
| * | | Add even for terrain tainting and synchronize terrain module with physics ↵Dan Lake2012-05-102-7/+33
| | | | | | | | | | | | | | | | scene before physics simulation step rather than after
* | | | Merge branch 'master' into careminsterMelanie2012-05-101-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-0/+4
| | | | | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | | | Merge branch 'master' into careminsterMelanie2012-05-094-14/+56
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | | Remove physics actor related race conditions in SetVehicleFlags() and ↵Justin Clark-Casey (justincc)2012-05-091-7/+9
| |/ / | | | | | | | | | | | | | | | SetPhysicsAxisRotation() sop.PhysActor can currently become null at any time.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-081-0/+2
| |\ \
| | * | Mantis 1456 same region teleport of a sitting avatar.Talun2012-05-091-0/+2
| | | | | | | | | | | | | | | | | | | | Region to region was fixed some time ago in EntityTransferModule. This applies the same fix for same region teleports.
| * | | Trigger event when scene presences are updatedDan Lake2012-05-082-0/+34
| |/ /
| * | Perform SceneGraph.DuplicateObject() under existing m_updateLock already ↵Justin Clark-Casey (justincc)2012-05-081-75/+89
| | | | | | | | | | | | | | | | | | | | | used for link and delinking, in order to avoid race conditions. DuplicateObject() relies on source object having correct link numbers for the duration of the dupe. Both link and delink can change link numbers such that they are not consistent for short periods of time.
* | | Merge branch 'avination' into careminsterMelanie2012-05-081-0/+27
|\ \ \ | | |/ | |/|
| * | Fix moving no-mod objects. Fixes a regression introduced with the undo fixMelanie2012-05-071-0/+27
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-072-3/+5
|\ \ \ | | |/ | |/|
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-071-1/+1
| | |
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for ↵dahlia2012-05-061-2/+4
| | | | | | | | | | | | moving NPCs
| * | Stop llSetPos from sending one update per child primMelanie2012-05-061-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-05-071-2/+4
|\ \ \ | | |/ | |/|
| * | SOG: tell physics about when we want a force or a impulse. (sorry add to ↵UbitUmarov2012-05-051-2/+4
| | | | | | | | | | | | change here also)
* | | Merge branch 'avination' into careminsterMelanie2012-05-052-17/+104
|\ \ \ | |/ /
| * | Add the default animation to the child agent data updateMelanie2012-05-041-0/+3
| | |
| * | Reverse the order of physics event unsubscription to allow GC. Adapted from ↵Melanie2012-05-041-2/+2
| | | | | | | | | | | | Unit's reverted patch
| * | Retain velocity on walking crossing - adapted from Ubit's reverted patchMelanie2012-05-041-1/+13
| | |
| * | Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs ↵Melanie2012-05-042-28/+8
| | | | | | | | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);" This reverts commit 12c9916193bbb87aaa95407f798c241cbe5e23cb.
| * | *TO TEST/REVIEW* added current default animation in animationSet.cs ↵UbitUmarov2012-05-042-8/+28
| | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
| * | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ↵UbitUmarov2012-05-041-12/+54
| | | | | | | | | | | | changed crossing code to restore sitting avas in case of group cross fail
| * | Stabilize sit position on region crossingMelanie2012-05-031-1/+7
| | |
| * | Clear permissions given to the object we stand up fromMelanie2012-05-031-1/+25
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-053-18/+70
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has ↵Justin Clark-Casey (justincc)2012-05-051-2/+8
| | | | | | | | | | | | | | | | | | | | | changed owners is rezzed. This needs to occur after the script is resumed rather than before, when the event is just dropped. Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
| * | Mantis 60004 problems with damage and llSetDamage. In damage enabled areas ↵Talun2012-05-041-7/+46
| | | | | | | | | | | | this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
| * | Reinsert a 2000ms delay before closing a no longer required agent on the ↵Justin Clark-Casey (justincc)2012-05-031-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | source region after teleport to resolve Imprudence teleport problems. Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region. If Imprudence receives a DisableSimulator in this period, it quits. We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly. This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-031-3/+6
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'avination'Melanie2012-05-031-4/+12
|\ \ \ | | |/ | |/|
| * | Improved sitted avatars crossings ( plus tests on vehicles)UbitUmarov2012-05-021-4/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-024-13/+122
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
generated by cgit v1.1 at 2025-01-07 03:18:23 +0000