| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster | Melanie | 2013-03-29 | 3 | -1/+33 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | ||||
| | * | Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 4 | -2/+31 |
| | | | | | | | | | | | | | | | | | scripts in attachments. This was because the script resumption in AttachmentsModule was firing the attach event instead. Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal. This is to resolve http://opensimulator.org/mantis/view.php?id=6578 | ||||
| * | | Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster | Melanie | 2013-03-29 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Revert "Try eliminating the pause before auto-reteleporting for a megaregion ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | now that we're telepoting in a different way." Unfortunately fails on Nebadon's system right now. Needs investigation. May put in a temproary option for experimentation soon. This reverts commit d87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba. | ||||
| * | | Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster | Melanie | 2013-03-29 | 1 | -0/+3 |
| |\ \ | |/ | |||||
| | * | Add Location (relative), Rotation (Relative) and Rotation (World) to "show ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -0/+3 |
| | | | | | | | | | part" and other related console commands | ||||
| * | | Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster | Melanie | 2013-03-29 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Try eliminating the pause before auto-reteleporting for a megaregion now ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | that we're telepoting in a different way. On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up. Trying this change to see if this is true for other people. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-29 | 1 | -21/+0 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Eliminate code which tries to restart attachment scripts in ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -18/+0 |
| | | | | | | | | | ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule | ||||
| * | | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster | Melanie | 2013-03-29 | 4 | -24/+23 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | ||||
| | * | Stop attempts to update/add existing attachments in user inventory when ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 4 | -24/+25 |
| | | | | | | | | | | | | | teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory. | ||||
| * | | Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster | Melanie | 2013-03-29 | 1 | -54/+145 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | ||||
| | * | Add "debug attachments" console command to allow highly verbose attachment ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -61/+109 |
| | | | | | | | | | | | | | logging to be switched on and off. Default is off. | ||||
| * | | Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster | Melanie | 2013-03-29 | 1 | -5/+0 |
| |\ \ | |/ | |||||
| | * | minor: remove some mono compiler warnings from EntityTransferModule | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -5/+0 |
| | | | |||||
| * | | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster | Melanie | 2013-03-29 | 1 | -27/+27 |
| |\ \ | |/ | |||||
| | * | minor: comment out unused Scene.AgentCrossing() to reduce code complexity | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -27/+27 |
| | | | |||||
| * | | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster | Melanie | 2013-03-29 | 3 | -11/+19 |
| |\ \ | |/ | |||||
| | * | If the viewer has already rezzed any attachments itself, then ignore the ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 3 | -11/+19 |
| | | | | | | | | | | | | | simulator-side rez attachments call. This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder. | ||||
| * | | Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster | Melanie | 2013-03-29 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Fix regression tests by making a new NPC always trigger simulator side ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | attachment code when created. Regression from previous commit c2093ccc. Failed because NPCs don't set the ViaLogin flag | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-28 | 5 | -43/+64 |
| | |\ | |||||
| * | \ | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster | Melanie | 2013-03-29 | 3 | -45/+39 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Move the simulator-side RezAttachments call on login to SP.MakeRootAgent ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 3 | -39/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary. This is to simplify the code (no tricky 'wasChild' signalling required) and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers) and the viewer-side attaching the v3 viewers perform. | ||||
| * | | | Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster | Melanie | 2013-03-29 | 5 | -43/+64 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | BulletSim: fix race condition when creating very large mega-regions. | Robert Adams | 2013-03-28 | 5 | -22/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The symptom was exceptions while creating physical terrain. Reduce default terrain mesh magnification to 2 from 3 because the higher resolution uses a lot of memory and doesn't solve the terrain smoothness for vehicles. Added comments here and there and improved some debugging log messages. | ||||
| | * | | BulletSim: tweaks to terrain boundry computation. No functional changes. | Robert Adams | 2013-03-28 | 1 | -21/+29 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-28 | 5 | -62/+100 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | ||||
| | * | Add back a log message when we attempt a megaregion auto-reteleport | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -0/+4 |
| | | | |||||
| | * | minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -4/+7 |
| | | | | | | | | | if module was enabled. | ||||
| | * | Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+1 |
| | | | | | | | | | region is removed rather than base.AddRegion() | ||||
| | * | Instead of going via GodLikeRequestTeleport, auto-teleport the agent ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 2 | -4/+13 |
| | | | | | | | | | | | | | directly in a megaregion, in the same manner at the "teleport user" console command. This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening. | ||||
| | * | On the North and East sides of a megaregion, only consider regions within ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | 256m to be neighbours rather than regions up to 512 distant. This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides. This reduces the number of child agents being logged into regions neighbouring a megaregion. | ||||
| | * | minor: Fix usage error message for "debug eq" console command | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+1 |
| | | | |||||
| | * | Make HGLureModule track god like lures as well as normal lures, to see if ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+2 |
| | | | | | | | | | this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active. | ||||
| | * | Add "show eq" console command to show numbers of messages in agent event queues. | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -0/+23 |
| | | | | | | | | | For debugging purposes. | ||||
| | * | Remove some Console.WriteLines accidentally left in last commit cfb20f09 | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -2/+0 |
| | | | |||||
| | * | refactor: combine the checks for megaregion view range into a single place. | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -51/+51 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-28 | 1 | -1/+44 |
| |\ \ | |/ | |||||
| | * | Fix problem with megaregions where teleporting into a different region which ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+44 |
| | | | | | | | | | | | | | | | | | | | | | already had a child agent would stop the eq working for the agent in the new region. This was because the calculation as to whether a new agent was needed in the receiving region did not take megaregions into account, unlike the original calculation when the user first teleported into the region. This meant that on teleport, entity transfer would create a new CAP but this would be ignored by the viewer and receiving region, meaning that the EQ could no longer be used. This would prevent subsequent teleport, amongst other things. Currently, regions up to 512m from a megaregion are considered neighbours. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-27 | 1 | -52/+64 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-26 | 1 | -52/+64 |
| | |\ | |||||
| | | * | BulletSim: prevent asset fetching loop when the fetched asset fails to mesh. | Robert Adams | 2013-03-26 | 1 | -52/+64 |
| | | | | | | | | | | | | | | | | | | | | | | Check for the case where the fetched mesh asset fails meshing (degenerate triangles or no physical mesh). In this case, the asset is marked 'failed' and BulletSim doesn't keep trying to fetch over-and-over trying to get a good asset. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-26 | 22 | -16/+46 |
| | |\ \ | | |/ | |||||
| | * | | Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars ↵ | Justin Clark-Casey (justincc) | 2013-03-26 | 1 | -30/+194 |
| | | | | | | | | | | | | | | | | | | | | | | in a linkset. llGetPrimitiveParams() works through PRIM_LINK_TARGET Setting via llSetLinkPrimitiveParams(), etc. not yet implemented | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-26 | 1 | -0/+6 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Implement a pref to turn on the simulator ExportSupported feature entry. | Melanie | 2013-03-26 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | This tells the viewer to enable the UI for export permissions. WARNING: If your inventory store contains invalid flags data, this will result in items becoming exportable! Don't turn this on in production until it's complete! | ||||
| | * | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-26 | 21 | -16/+40 |
| | |/ | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions" | ||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2013-03-26 | 21 | -20/+42 |
| |\ \ | | | | | | | | | | careminster | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |