aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-153-512/+191
|\
| * 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
| |
* | Fix issue where loading OARs could sometimes result in link numbers being ↵Justin Clark-Casey (justincc)2012-05-151-1/+12
|/ | | | | | | | | | reordered. This was because the parts in scene objects were sometimes not serialized in link order. This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this had not been done in the SerialiserModule methods that OAR loading used. Add regression test for same. Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749
* 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 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-102-7/+13
|\
| * 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
| * 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.
* | 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' 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.
* 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
|
* 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.
* Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-013-10/+109
| | | | | | | simulator This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true. Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
* refactor: Split most of EntityTransferModule.Teleport() into its same region ↵Justin Clark-Casey (justincc)2012-05-011-4/+33
| | | | | | and different region teleport components. DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
* Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on ↵Justin Clark-Casey (justincc)2012-04-303-4/+9
| | | | | | and off within tests. This makes *.Tests.dll.config files no longer needed, hence deleted.
* refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 ↵Justin Clark-Casey (justincc)2012-04-301-73/+75
| | | | into SendControlsToScripts() (instead of SendControlToScripts()).
* Fixed: scripted controls didn't work if the avatar was sitting downOren Hurvitz2012-04-301-9/+15
| | | | This fixes a bug introduced in 6473674bbf6ce006512083902e8ff1796d8c8b22
* Comment out debug [ASYNC DELETER] messages for now.Justin Clark-Casey (justincc)2012-04-281-5/+5
|
* Fixed: custom walking animations didn't stop when the avatar stopped walking.Oren Hurvitz2012-04-272-20/+32
| | | | | | This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK. This reverts commit feef1dd73243cfdd5322632fb67e64cabc1ad4bc.
* If a Grid God teleports then include the Godlike teleport flag. This can ↵Oren Hurvitz2012-04-271-0/+17
| | | | affect the starting position in the destination region.
* Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-2720-173/+92
| | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
* Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-261-1/+4
| | | | problem resolution.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-261-0/+30
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-04-262-5/+5
| |\
| * \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-265-12/+89
| |\ \
| * | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-261-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osNpcSay(UUID npc, string message) left untouched New functions:- osNpcSay(UUID npc, int channel, string message) osNpcShout(UUID npc, int channel, string message) osNpcWhisper(UUID npc, int channel, string message) Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | | Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing ↵Justin Clark-Casey (justincc)2012-04-261-35/+35
| |_|/ |/| | | | | | | | analysis complexity
* | | minor: Add avatar name to removing agent log messageJustin Clark-Casey (justincc)2012-04-261-2/+2
| | |
* | | Comment out avatar move to target message for now.Justin Clark-Casey (justincc)2012-04-251-3/+3
| |/ |/|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-251-2/+40
|\ \
| * | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵Melanie2012-04-251-2/+40
| | | | | | | | | | | | scripts work. Fixes Mantis #5990
* | | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-252-1/+3
|/ / | | | | | | | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior.
* | Commit the avination Teleport() methods (adaptedto justincc's changes)Melanie2012-04-251-1/+12
| |
* | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-251-16/+0
| | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
* | Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-252-0/+42
|/
* Mantis 5977 Corrections to llRegionSayToTalun2012-04-232-4/+24
| | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* Make TestSetPhysicsSinglePrim() actually add the object to the scene in ↵Justin Clark-Casey (justincc)2012-04-221-0/+2
| | | | order to test more code paths.
* Fix bug where setting phantom on a prim would result in a server log message ↵Justin Clark-Casey (justincc)2012-04-223-12/+13
| | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
* Add test for setting physics in a linksetJustin Clark-Casey (justincc)2012-04-211-2/+28
|
* Add regression test for prim status when root prim in a new linkset is ↵Justin Clark-Casey (justincc)2012-04-212-1/+20
| | | | non-physical