aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' into avination-currentMelanie2013-04-280-0/+0
|\
| * Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-04-28557-21756/+45174
| |\ | | | | | | | | | | | | Conflicts: bin/Regions/Regions.ini.example
| * \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-04-2841-502/+1200
| |\ \
* | \ \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵Melanie2013-04-28567-22204/+46320
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | into avination-current Conflicts: bin/Regions/Regions.ini.example
| * | Controller module for dynamic floaters (WIP)Melanie2013-04-272-0/+279
| | |
| * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-253-13/+8
| | | | | | | | | | | | | | | | | | 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 Canto2013-04-251-2/+1
| | |
| * | Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-252-0/+339
| | | | | | | | | | | | compliant viewers
| * | Send 503 when throttling texturesMelanie2013-04-252-2/+34
| | |
| * | Gods module cleanupMelanie2013-04-251-10/+0
| | |
| * | Add the enter uuid dialogMelanie2013-04-221-0/+7
| | |
| * | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-226-12/+22
| | |
| * | Add the set object owner floater templateMelanie2013-04-221-0/+8
| | |
| * | Merge branch 'master' into careminsterMelanie2013-03-310-0/+0
| |\ \
| | * | Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-313-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
| * | | Merge branch 'master' into careminsterMelanie2013-03-312-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-301-25/+27
| | | | | | | | | | | | | | | | actively writing, simply return null instead of first logging an exception.
| | * | refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to ↵Justin Clark-Casey (justincc)2013-03-301-9/+9
| | | | | | | | | | | | | | | | InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-3131-396/+1089
| |\ \ \
| | * \ \ Merge branch 'master' into careminsterMelanie2013-03-301-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-291-6/+6
| | | | | | | | | | | | | | | | | | | | into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
| | * | | Merge branch 'master' into careminsterMelanie2013-03-297-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 Cozens2013-03-295-65/+196
| | | | |
| | | * | Check viewer 2/3 attachment calls against avatar appearance attachment data ↵Justin Clark-Casey (justincc)2013-03-293-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 careminsterMelanie2013-03-293-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-294-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 careminsterMelanie2013-03-291-1/+1
| | |\ \ \ | | | |/ /
| | | * | Revert "Try eliminating the pause before auto-reteleporting for a megaregion ↵Justin Clark-Casey (justincc)2013-03-291-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 careminsterMelanie2013-03-291-0/+3
| | |\ \ \ | | | |/ /
| | | * | Add Location (relative), Rotation (Relative) and Rotation (World) to "show ↵Justin Clark-Casey (justincc)2013-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | part" and other related console commands
| | * | | Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminsterMelanie2013-03-291-1/+1
| | |\ \ \ | | | |/ /
| | | * | Try eliminating the pause before auto-reteleporting for a megaregion now ↵Justin Clark-Casey (justincc)2013-03-291-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 careminsterMelanie2013-03-291-21/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | | * | Eliminate code which tries to restart attachment scripts in ↵Justin Clark-Casey (justincc)2013-03-291-18/+0
| | | | | | | | | | | | | | | | | | | | ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
| | * | | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-294-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-284-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 careminsterMelanie2013-03-291-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-281-61/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logging to be switched on and off. Default is off.
| | * | | Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminsterMelanie2013-03-291-5/+0
| | |\ \ \ | | | |/ /
| | | * | minor: remove some mono compiler warnings from EntityTransferModuleJustin Clark-Casey (justincc)2013-03-281-5/+0
| | | | |
| | * | | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
| | |\ \ \ | | | |/ /
| | | * | minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
| | | | |
| | * | | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-293-11/+19
| | |\ \ \ | | | |/ /
| | | * | If the viewer has already rezzed any attachments itself, then ignore the ↵Justin Clark-Casey (justincc)2013-03-283-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 careminsterMelanie2013-03-291-2/+2
| | |\ \ \ | | | |/ /
| | | * | Fix regression tests by making a new NPC always trigger simulator side ↵Justin Clark-Casey (justincc)2013-03-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attachment code when created. Regression from previous commit c2093ccc. Failed because NPCs don't set the ViaLogin flag
| | * | | Merge commit 'e97567e22740b7161ae1c0fe45c2dcec3abbfd4b' into careminsterMelanie2013-03-290-0/+0
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-285-43/+64
| | | |\ \
| | * | \ \ Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-293-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-283-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.
generated by cgit v1.1 at 2024-12-30 16:48:12 +0000