aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-274-10/+21
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-4/+15
| | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
| * Merge branch 'ubitwork' into avinationMelanie2012-09-241-1/+1
| |\
| | * If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-241-1/+1
| | | | | | | | | | | | simply process it as if UUID.Zero had been given.
| * | Comment out asset error for sculpts/meshes. If an asset is missing it's missing.Melanie2012-09-231-4/+4
| |/ | | | | | | We can't put it back so we don't need to know.
| * Make IncomingCloseChildAgent not send a stop packet. This may preventMelanie2012-09-161-1/+1
| | | | | | | | a viewer from being logged out after an otherwise successful teleport.
* | Remove a core undo call that we don't need.Melanie2012-09-271-2/+0
| |
* | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-272-31/+42
| |
* | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-271-2/+190
|\ \
| * | Documenting object-related eventsSignpostMarv2012-09-241-0/+43
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-241-10/+17
| |\ \
| * | | Documenting LSL script-related eventsSignpostMarv2012-09-241-2/+147
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-09-243-55/+261
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-0/+52
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-221-0/+36
| | |\ \
| | * | | Documenting non-LSL script-related eventsSignpostMarv2012-09-221-0/+52
| | | | |
| * | | | This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-211-10/+17
| | |/ / | |/| | | | | | | | | | 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-211-0/+36
| |/ / | | | | | | | | | No need to keep 2 separate files.
| * | Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't ↵Justin Clark-Casey (justincc)2012-09-211-7/+4
| | | | | | | | | | | | 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.
| * | Simplify UuidGatherer by performing asset fetch synchronously rather than ↵Justin Clark-Casey (justincc)2012-09-211-40/+44
| | | | | | | | | | | | using the async call but waiting for completion anyway!
| * | Documentation of teleport-related eventsSignpostMarv2012-09-201-0/+19
| | |
| * | minor tweaks to existing comments for IDE goodnessSignpostMarv2012-09-201-4/+7
| | |
| * | Documentation of agent-related eventsSignpostMarv2012-09-201-1/+34
| | |
| * | Documentation of object-related eventsSignpostMarv2012-09-201-1/+38
| | |
| * | Documentation of OnPluginConsoleSignpostMarv2012-09-201-0/+16
| | |
| * | Make ResendAppearanceUpdates = true by default in [Appearance] in ↵Justin Clark-Casey (justincc)2012-09-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
| * | Cleanup from prev. commitBlueWall2012-09-181-2/+2
| | | | | | | | | | | | Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-3/+3
| | | | | | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* | | Merge branch 'master' into careminsterMelanie2012-09-171-1/+41
|\ \ \ | |/ /
| * | Documentation of IScriptModuleComms.RegisterConstant and ↵SignpostMarv2012-09-171-1/+18
| | | | | | | | | | | | | | | | | | IScriptModuleComms.LookupModConstant Signed-off-by: Melanie <melanie@t-data.com>
| * | Implementing ability to register script constants and invocations on a ↵SignpostMarv2012-09-171-0/+23
| | | | | | | | | | | | region module automatically
* | | Merge branch 'master' into careminsterMelanie2012-09-171-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | preventing a null reference exception from being thrownSignpostMarv2012-09-171-0/+3
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'avination' into careminsterMelanie2012-09-162-3/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Wait a bit longer for new scene presences to aid tps into laggy regionsMelanie2012-09-141-1/+1
| | |
| * | Add the option to have variable costing for uploadsMelanie2012-09-111-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-165-14/+150
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Added unit tests for multi-region OARsOren Hurvitz2012-09-141-1/+5
| | |
| * | Support multi-region OAR filesOren Hurvitz2012-09-142-3/+8
| | | | | | | | | | | | 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.
| * | Documentation of parcel-related eventsSignpostMarv2012-09-131-0/+44
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Fix indentation and issues where tabs were used instead of spaces in commit ↵Justin Clark-Casey (justincc)2012-09-121-7/+8
| | | | | | | | | | | | 783ee949
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-121-1/+1
| |\ \
| | * | Allow an incoming identifier to be specified for a JsonStore.Mic Bowman2012-09-111-1/+1
| | | |
| * | | Documentation of economy-related EventManager eventsSignpostMarv2012-09-121-0/+21
| |/ /
| * | documentation (OnSceneObjectPartCopy)SignpostMarv2012-09-111-0/+3
| | |
| * | documentation (OnRemovePresence)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnNewPresence)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnClientConnect)SignpostMarv2012-09-111-0/+9
| | |
| * | documentation (OnBackup)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnTerrainTick)SignpostMarv2012-09-111-0/+7
| | |
generated by cgit v1.1 at 2024-12-21 08:23:36 +0000