| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Refactor to get closer to core | Melanie | 2013-05-11 | 2 | -3/+3 | |
| | | | ||||||
| * | | Remove dumb "Region found!" message from map search | Melanie | 2013-05-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | Implement llSetContentType using the new OpenID auth support for authentication | Melanie | 2013-05-05 | 5 | -1/+71 | |
| | | | ||||||
| * | | Add RegionManager level and the ability to use literal XML to the dynamic ↵ | Melanie | 2013-05-04 | 4 | -5/+17 | |
| | | | | | | | | | floater module | |||||
| * | | Add llGetPhysicsMaterial | Melanie | 2013-05-04 | 3 | -0/+18 | |
| | | | ||||||
| * | | Fix the long standing bug of items being delivered to lost and found or ↵ | Melanie | 2013-05-01 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission. | |||||
| * | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | Melanie | 2013-04-30 | 1 | -2/+8 | |
| |\ \ | | | | | | | | | | into avination-current | |||||
| | * | | Fix bug where an agent that declined an inventory offer and subsequently ↵ | Justin Clark-Casey (justincc) | 2013-04-30 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | emptied their trash would make the item invalid in the giver's inventory This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy. | |||||
| * | | | Fix CAPS to work like they should - do not send caps to the viewer if ↵ | Melanie | 2013-04-30 | 2 | -2/+13 | |
| |/ / | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case. | |||||
| * | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | Melanie | 2013-04-28 | 307 | -8060/+25018 | |
| |\ \ | | | | | | | | | | | | | | | | | | | into avination-current Conflicts: bin/Regions/Regions.ini.example | |||||
| | * | | Controller module for dynamic floaters (WIP) | Melanie | 2013-04-27 | 2 | -0/+279 | |
| | | | | ||||||
| | * | | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵ | Melanie | 2013-04-25 | 2 | -12/+7 | |
| | | | | | | | | | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI. | |||||
| | * | | Make the kicked user's avie truly disappear when it's god-kicked. | Diva Canto | 2013-04-25 | 1 | -2/+1 | |
| | | | | ||||||
| | * | | Adding the dynamic menu module which allows registering new menu options in ↵ | Melanie | 2013-04-25 | 2 | -0/+339 | |
| | | | | | | | | | | | | | compliant viewers | |||||
| | * | | Send 503 when throttling textures | Melanie | 2013-04-25 | 1 | -1/+33 | |
| | | | | ||||||
| | * | | Gods module cleanup | Melanie | 2013-04-25 | 1 | -10/+0 | |
| | | | | ||||||
| | * | | Allow callers to set the invoice parameter for GenericMessage | Melanie | 2013-04-22 | 4 | -8/+18 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-03-31 | 2 | -44/+34 | |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | | * | In the flotasm asset cache, if we get a request for a file that we're ↵ | Justin Clark-Casey (justincc) | 2013-03-30 | 1 | -25/+27 | |
| | | | | | | | | | | | | | actively writing, simply return null instead of first logging an exception. | |||||
| | | * | refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to ↵ | Justin Clark-Casey (justincc) | 2013-03-30 | 1 | -9/+9 | |
| | | | | | | | | | | | | | InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods | |||||
| | * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-03-31 | 30 | -396/+1023 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' into careminster | Melanie | 2013-03-30 | 1 | -6/+7 | |
| | | |\ \ | | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||||
| | | | * | refactor: move the append magic number processing for attachments back up ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2 | |||||
| | | * | | Merge branch 'master' into careminster | Melanie | 2013-03-29 | 7 | -85/+216 | |
| | | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | | * | Added missing functionality (mainly custom headers) to llHTTPRequest. | Kevin Cozens | 2013-03-29 | 4 | -65/+195 | |
| | | | | | ||||||
| | | | * | Check viewer 2/3 attachment calls against avatar appearance attachment data ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 3 | -26/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than actually attached objects By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side. Initiating simulator-side is always necessary for version 1 viewers. This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581 | |||||
| | | * | | 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 | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |