aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-293-31/+72
|\ | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an ↵Justin Clark-Casey (justincc)2012-09-292-14/+18
| | | | | | | | | | | | | | object is attached from the scene. Enables previously disabled regression test. Based on SingpostMarv's patch in http://opensimulator.org/mantis/view.php?id=6302 but I prefer a simpler approach that does not expose a resume scripts option right now.
| * Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
| | | | | | | | | | This reveals that the event is not being fired when an object is attached from ground, which is incorrect. This check is temporairly disabled.
| * Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent ↵Justin Clark-Casey (justincc)2012-09-281-6/+11
| | | | | | | | | | | | concurrent thread use provoking mono crashes. Same rationale as commit 13690582.
* | Merge branch 'avination' into careminsterMelanie2012-09-276-36/+38
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | just remove the damm thingUbitUmarov2012-09-261-1/+1
| | |
| * | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-261-1/+0
| | | | | | | | | | | | control flag to false
| * | UriModule GetEvents also doesn't need a request bodyUbitUmarov2012-09-261-0/+1
| | |
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-1/+1
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
| * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-243-36/+37
| | | | | | | | | | | | simply process it as if UUID.Zero had been given.
| * | Change the close tmeout from 2 to 3 seconds on teleport. This mayMelanie2012-09-161-1/+1
| | | | | | | | | | | | prevent being logged out after a successful teleport.
| * | Make the agent being kicked a child agent first so there won't be a ghostMelanie2012-09-161-1/+2
| | |
* | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-275-15/+68
|\ \ \ | | |/ | |/|
| * | Use GridUser properly for foreign users.Diva Canto2012-09-262-3/+5
| | |
| * | Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| | |
| * | Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-253-199/+183
| |\ \
| | * | Fix very recently introduced race condition where a CreateNewItem outracing ↵Justin Clark-Casey (justincc)2012-09-251-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-251-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-252-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-253-64/+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-253-110/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-5/+54
| | | |
| * | | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
| | | |
* | | | 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
generated by cgit v1.1 at 2024-12-30 01:14:10 +0000