aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (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)
* Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-271-2/+0
|\
| * Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-2410-115/+468
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * HG Rez object: warn the user if the item or asset cannot be found.Diva Canto2012-09-221-2/+7
| |
| * Guard against inventory get failures.Diva Canto2012-09-221-0/+3
| |
| * This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-211-0/+28
| | | | | | | | Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
| * Moved the small HGUuidGatherer class to the file where its parent class is. ↵Diva Canto2012-09-212-74/+2
| | | | | | | | No need to keep 2 separate files.
| * Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already ↵Diva Canto2012-09-211-18/+24
| | | | | | | | downloads the assets, so we don't need to do it again...
| * Minor: may avoid crashes of sims that still don't have this configuration ↵Diva Canto2012-09-211-1/+1
| | | | | | | | section.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-2/+2
| |\
| | * Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't ↵Justin Clark-Casey (justincc)2012-09-211-2/+2
| | | | | | | | | | | | been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
| * | HG 2.0: added asset import/export policies at the sim too.Diva Canto2012-09-211-8/+15
| | |
| * | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| |/
| * More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-201-15/+19
| | | | | | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
| * Correctly override and call base OpenSimTestCase.SetUp() method in ↵Justin Clark-Casey (justincc)2012-09-193-6/+11
| | | | | | | | | | | | GridConnectorsTests and ArchiverTests. Remove unrelated compile warning from AttachmentsModuleTests.
| * Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-0/+367
| |
* | Merge branch 'master' into careminsterMelanie2012-09-171-31/+59
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * HG2.0: Generalized the allowed HG appearances to be more than 1.Diva Canto2012-09-161-31/+59
| |
* | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Wait longer for arrival cofirmation to aid tps into laggy regionsMelanie2012-09-141-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-1617-774/+2011
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-1512-760/+1826
| |\ \
| | * | Add basic asset connector tests to check behaviour for normal, local and ↵Justin Clark-Casey (justincc)2012-09-152-2/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
| | * | For FlotsamAssetCache, always update access times of cached scene assets ↵Justin Clark-Casey (justincc)2012-09-151-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before looking for files to expire. This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed. The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced. This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
| | * | Added unit tests for multi-region OARsOren Hurvitz2012-09-141-58/+326
| | | |
| | * | Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ↵Justin Clark-Casey (justincc)2012-09-143-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-OAR patch there is now only one class that handles this operation. Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105 since that did not directly apply
| | * | Support multi-region OAR filesOren Hurvitz2012-09-148-395/+1057
| | | | | | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| * | | More on HG2.0: added the possibility of controlling the appearance that ↵Diva Canto2012-09-152-2/+171
| |/ / | | | | | | | | | avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-131-1/+1
| |\ \
| | * | correcting a typo that causes c# express to complain about xml comment ↵SignpostMarv2012-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | containing invalid xml Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | Restarting to work on HGSuitcaseInventoryService: added the ability for the ↵Diva Canto2012-09-131-0/+2
| |/ / | | | | | | | | | outside world to retrieve appearance items. Not ACLed yet.
| * | minor: Comment out friends notification log spam for now.Justin Clark-Casey (justincc)2012-09-121-3/+3
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-104-144/+215
|\ \ \ | | |/ | |/|
| * | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-0/+3
| | | | | | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly.
| * | stop sending duplicated parcelProprieties at loginUbitUmarov2012-09-071-18/+39
| | |
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-041-0/+6
| |\ \
| | * | let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
| | | | | | | | | | | | | | | | regions )
| * | | Remove debug spamMelanie2012-09-041-6/+6
| | | |
| * | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-94/+110
| |/ / | | | | | | | | | it's own sub-method
| * | try to reduce potencial recursive lockingUbitUmarov2012-09-011-26/+51
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-103-2/+4
|\ \ \ | | |/ | |/|
| * | Adjust namespce of FlotsamCacheBlueWall2012-09-092-2/+1
| | | | | | | | | | | | Place FloatsamCache in the same namespace as our other core asset caches
| * | Revert "Move addin information to CoreModulePlugin.addin.xml"BlueWall2012-09-093-3/+6
| | | | | | | | | | | | | | | | | | This reverts commit 2ec34580ce3807cede97539488237040e1a8a6cc. Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278.
* | | Merge branch 'master' into careminsterMelanie2012-09-0711-51/+230
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | Move addin information to CoreModulePlugin.addin.xmlBlueWall2012-09-073-6/+3
| | | | | | | | | | | | Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
generated by cgit v1.1 at 2024-12-21 03:50:49 +0000