aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix very recently introduced race condition where a CreateNewItem outracing ↵Justin Clark-Casey (justincc)2012-09-271-19/+18
| | | | | | | | an UploadAsset request could throw an exception because m_asset did not yet exist. This was accidentally introduced in 4fc0cfb This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation. The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves.
* Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-271-6/+6
| | | | | This was only used if none of new item, update item or update task item had been set. But since all transactions go through these paths this old code is redundant.
* Insert transaction ID into AssetXferUploader constructor rather than at ↵Justin Clark-Casey (justincc)2012-09-272-36/+49
| | | | | | | UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first. This was preventing the previous race condition fix in 4fc0cfb from actually working. This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
* Move UDP update task item code to AssetXferUploader to match existing create ↵Justin Clark-Casey (justincc)2012-09-273-50/+52
| | | | | | | user item and update user item mechanisms This is done for consistency and to allow removal or some access methods that increase code complexity. However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
* Fix occasional race condition failure when creating new clothing/body parts ↵Justin Clark-Casey (justincc)2012-09-273-110/+93
| | | | | | | | | in the viewer or updating existing assets. On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem. It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail. So instead we always set up a Xfer object on either the asset or inventory item update request. This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
* Fix slow loading of task inventoryMelanie2012-07-191-4/+7
|
* Merge branch 'master' into careminsterMelanie2012-06-071-8/+7
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-071-8/+7
| | | | | | | | Also change code to grab the agent asset transaction module once.
* | Merge branch 'master' into careminsterMelanie2012-03-271-1/+21
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-1/+21
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-01-281-1/+1
|\ \ | |/
| * Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-281-1/+1
| | | | | | | | agent id anyway
* | Merge branch 'master' into careminsterMelanie2012-01-061-11/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Improve "j2k decode" command to tell us how many layers and components were ↵Justin Clark-Casey (justincc)2012-01-051-5/+16
| | | | | | | | decoded, instead of just success/failure
| * Add a "j2k decode" region console command that allows a manual request for a ↵Justin Clark-Casey (justincc)2012-01-051-8/+10
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Minor formatting changes and commented out log lines for future debugging of ↵Justin Clark-Casey (justincc)2012-01-041-0/+4
| | | | | | | | image manager (udp texture fetch). No significant functional changes.
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-021-0/+3
| | | | | | | | hunting. No functional changes.
* | Merge branch 'master' into bigmergeMelanie2011-11-141-2/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-141-2/+0
| |
* | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-113-98/+238
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
| * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-233-82/+238
| | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-051-256/+0
|\ \ | |/
| * Moved several cap-based-service-providing modules from where they were into ↵Diva Canto2011-04-301-255/+0
| | | | | | | | a newly created CoreModules/Caps. Not all.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-4/+5
|\ \ | |/
| * Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.Justin Clark-Casey (justincc)2011-04-281-4/+5
| | | | | | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5444 Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct. This did not effect scripts.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-1/+26
|\ \ | |/
| * Fixed Caps handlers leakDiva Canto2011-02-051-1/+0
| |
| * One more diagnosis command:Diva Canto2011-02-051-1/+27
| | | | | | | | show caps
* | Add a "useCached" parameter to GetUserAccount. Add a function to Scene to ↵Tom2011-01-261-6/+1
| | | | | | | | get the user flags. It has to be here due to access restrictions :/
* | Add userFlags check to isBanned. This checks bans against DenyAnonymous and ↵Tom2011-01-261-1/+7
| | | | | | | | DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on .
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-6/+6
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-01-211-2/+2
| |
| * implement "show throttles" command for showing current agent throttles and ↵Justin Clark-Casey (justincc)2011-01-211-200/+0
| | | | | | | | | | | | | | | | | | the server settings. This is in a very crude state, currently. The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved). This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
| * minor: help text adjustment for "show queues"Justin Clark-Casey (justincc)2011-01-201-2/+2
| |
| * remove reference to CoreModules from ClientStack.LindenUDPJustin Clark-Casey (justincc)2011-01-201-2/+2
| | | | | | | | client stack uses modules in the same way that scene does - through their interfaces
| * Move "show queues" command out of OpenSim.cs and into a separate module.Justin Clark-Casey (justincc)2011-01-201-0/+200
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-251-80/+14
|\ \ | |/
| * One more pass at object inventory. This time, fix SceneObjectPartInventory ↵Diva Canto2010-12-241-80/+14
| | | | | | | | so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-241-35/+49
|\ \ | |/
| * Hopefully this fixes all prim inventory issues. No more abort, no more ↵Diva Canto2010-12-231-35/+49
| | | | | | | | | | | | keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added. This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-234-866/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-231-6/+5
| |\
| * | Removed unused code -- this was the previous version of UDP texture sending, ↵Diva Canto2010-12-234-866/+0
| | | | | | | | | | | | which now lives entirely in LindenUDP space.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-6/+5
|\ \ \ | | |/ | |/|
| * | Put back a commented section of code. With some viewers, object inventoryMelanie2010-12-231-6/+5
| |/ | | | | | | transfers just don't start without it. Observed my Nebadon and yours truly.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-16/+42
|\ \ | |/
| * Added a counter to NewFiles in Xfers to account for simultaneous object ↵Diva Canto2010-12-221-16/+42
| | | | | | | | inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-4/+66
|\ \ | |/
generated by cgit v1.1 at 2024-12-19 05:39:15 +0000