aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-146-39/+89
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-143-2/+29
| |
| * minor: add explanative comment to 'missing baked texture' logging commonly ↵Justin Clark-Casey (justincc)2012-05-141-0/+10
| | | | | | | | seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
| * Set the agent in transit teleport flag at the first available opportunity ↵Justin Clark-Casey (justincc)2012-05-141-11/+37
| | | | | | | | | | | | | | | | | | | | (i.e. when IsInTransit() was being checked) to close down a race condition. On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts. However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check. This has been seen in the field and the results aren't pretty. This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window. More failure cases are made to to call ResetInTransit() to adjust to this move.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-141-19/+5
| |\
| | * Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ↵Chris Koeritz2012-05-131-19/+5
| | | | | | | | | | | | | | | | | | of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Add more region information to some teleport related loggingJustin Clark-Casey (justincc)2012-05-141-7/+8
| |/
* | Merge branch 'master' into careminsterMelanie2012-05-131-0/+1
|\ \ | |/
| * Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-29/+2
| | | | | | | | | | | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-103-2/+29
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Add even for terrain tainting and synchronize terrain module with physics ↵Dan Lake2012-05-101-0/+1
| | | | | | | | scene before physics simulation step rather than after
* | Merge branch 'master' into careminsterMelanie2012-05-081-20/+9
|\ \ | |/
| * Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-073-32/+6
| | | | | | | | | | | | This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8. Yet again I accidentally committed something whilst evaluating it.
| * Better error handling if Load OAR or Save OAR failOren Hurvitz2012-05-073-6/+32
| |
| * refactor: Instead of performing a ScenePresence lookup twice over ↵Justin Clark-Casey (justincc)2012-05-071-18/+2
| | | | | | | | LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()
| * Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would ↵Justin Clark-Casey (justincc)2012-05-071-2/+7
| | | | | | | | not be notified once a non-local friend was found.
* | Merge branch 'master' into careminsterMelanie2012-05-0510-49/+86
|\ \ | |/ | | | | | | | | | | | | | | 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-052-10/+9
| | | | | | | | | | | | | | 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
| * Use the more efficient HashSet instead of List for ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | FlotasmAssetCache.m_CurrentlyWriting
| * Don't try and update the access time of a file that is actively being cached.Justin Clark-Casey (justincc)2012-05-041-2/+6
| | | | | | | | | | This may cause IOErrors on Windows. Aims to help with http://opensimulator.org/mantis/view.php?id=6003
| * Temporarily add debug log lines to lsl url request and releaseJustin Clark-Casey (justincc)2012-05-041-0/+13
| | | | | | | | To help with http://opensimulator.org/mantis/view.php?id=5993
| * Mantis 60004 problems with damage and llSetDamage. In damage enabled areas ↵Talun2012-05-041-3/+14
| | | | | | | | 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-2/+7
| | | | | | | | | | | | | | | | | | 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.
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2012-05-032-8/+3
| |
| * Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-033-24/+34
| | | | | | | | | | | | 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 'master' into careminsterMelanie2012-05-024-143/+205
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Comment out the five second sleep in etm.DoTeleport() if the old agent needs ↵Justin Clark-Casey (justincc)2012-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | to be closed because it is no longer in the child's view distance. This sleep appears unnecessary since a sleep has already occurred in WaitForCallback() whilst waiting for the destination region to notify of teleport success. There are no async operations between this sleep and the WaitForCallback() If this sleep is present, then teleporting back to the source region within 5 seconds results in a disconnection. If this sleep is commented out then teleporting quickly back and forth between two simulators appears to work without issue. Tested on standalone, local grid and distributed grid. Please revert if there's something that I've missed.
| * Remove some test code that accidentally crept in with 9d2e1c67Justin Clark-Casey (justincc)2012-05-011-3/+0
| |
| * Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-012-7/+30
| | | | | | | | | | | | | | 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.
| * Move max teleport distance check down into etm.DoTeleport() since this ↵Justin Clark-Casey (justincc)2012-05-011-40/+41
| | | | | | | | should apply to all teleport calls, not just those through Teleport()
| * refactor: Split most of EntityTransferModule.Teleport() into its same region ↵Justin Clark-Casey (justincc)2012-05-013-126/+165
| | | | | | | | | | | | and different region teleport components. DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
* | Merge branch 'avination'Melanie2012-05-021-0/+7
|\ \
| * | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-021-0/+7
| | | | | | | | | | | | work right, finally.
* | | Merge branch 'master' into careminsterMelanie2012-04-291-9/+15
|\ \ \ | | |/ | |/|
| * | Put scene object related console commands into new "Objects" help category ↵Justin Clark-Casey (justincc)2012-04-281-9/+13
| | | | | | | | | | | | rather than "Regions"
| * | Add flags information (phantom, physics, etc.) to "show object" and "show ↵Justin Clark-Casey (justincc)2012-04-271-0/+2
| | | | | | | | | | | | part" console commands
* | | Merge branch 'master' into careminsterMelanie2012-04-276-15/+49
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | If a Grid God teleports then include the Godlike teleport flag. This can ↵Oren Hurvitz2012-04-272-9/+28
| | | | | | | | | | | | affect the starting position in the destination region.
| * | Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-272-2/+8
| | | | | | | | | | | | DotNetZip provides much better compression than standard .NET.
| * | MapImageService: changed the event at which the map tiles are uploaded, ↵Diva Canto2012-04-271-3/+12
| | | | | | | | | | | | because they were being uploaded before the region was registered with the grid
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-2716-47/+71
| |\ \
| * | | Minor change in error message (HG teleport failures)Diva Canto2012-04-271-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-04-2716-46/+66
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-2713-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | When creating an OAR, objects where the user is the Creator are always ↵Oren Hurvitz2012-04-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | included, regardless of their permissions. The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
| * | | Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-263-23/+41
| |/ / | | | | | | | | | problem resolution.
* | | Adapt some TeleportWithMomentum callsMelanie2012-04-251-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-252-14/+15
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Slight rewording of output messages.Diva Canto2012-04-241-1/+1
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-241-0/+1
| |\ \
generated by cgit v1.1 at 2024-12-21 17:14:49 +0000