aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/UuidGatherer.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-41/+0
|
* bad merge?UbitUmarov2015-09-011-0/+40
|\
| * Merge branch 'master' into careminsterMelanie2014-01-281-26/+55
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * \ Intermediate commit. Sill errors.Melanie2014-01-051-3/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-10-041-1/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-06-301-11/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-251-0/+66
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-041-3/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-201-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-241-46/+90
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmergeMelanie2011-10-251-4/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-251-16/+22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Bring us up to date.Tom2011-09-141-5/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-211-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Fix bug where the uuid gatherer was not inspecting UUIDs for items in an ↵Justin Clark-Casey (justincc)2015-02-251-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedded object's inventory. Added regression test for this case. Likely a regression since 08606ae4 (Thu Jan 8 2015) Relates to Mantises 7439, 7450 and possibly others.
* | | | | | | | | | | | | | When inspecting a script or notecard, also try to look up any assets ↵Justin Clark-Casey (justincc)2015-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedded therein. This is primarily to fix an issue where inventory items for NPC attachments would not be saved in archives as the assets referenced in the appearance notecard were not checked in this manner. Relates to http://opensimulator.org/mantis/view.php?id=7376
* | | | | | | | | | | | | | Make the IteratingUuidGatherer the only UuidGatherer.Justin Clark-Casey (justincc)2015-01-081-654/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This UUID gatherer provides a superset of the previous gatherer's functionality as it also allows the caller to control gathering iterations for load purposes.
* | | | | | | | | | | | | | refactor: rename IteratingUuidGather.AddAssetUuidToInspect() and ↵Justin Clark-Casey (justincc)2014-12-051-114/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecordAssetUuids() to AddForInspection() as this properly describes what both of these methods do.
* | | | | | | | | | | | | | refactor: Make IteratingUUIDGatherer take a dictionary in its constructor ↵Justin Clark-Casey (justincc)2014-12-041-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like UUIDGatherer, so we can deal with future cases where the dictionary may already be pre-populated.
* | | | | | | | | | | | | | When processing incoming attachments via HG, if a request for uuid gathering ↵Justin Clark-Casey (justincc)2014-11-251-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or final asset import takes too long remove remaining requests from same user to prevent hold up of other user's incoming attachments. This improves upon the earlier naive simply queueing immplementation. Threshold is 30 seconds. If this happens to a user they can relog and fetch will be reattempted.
* | | | | | | | | | | | | | Introduce an IteratingUuidGatherer where each fetch from the asset service ↵Justin Clark-Casey (justincc)2014-11-251-44/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (iteration) can be controlled by the caller. This is to enable an imminent change where incoming HG scene object fetching can assess the time taken by each request rather than being forced to perform all requests in one call. Soon, this will replace the existing UuidGatherer since it is both simpler and more flexible.
* | | | | | | | | | | | | | Add "wearables check" console commandJustin Clark-Casey (justincc)2014-11-251-64/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checks that all the wearable assets and any assets for a given logged in avatar exist in the asset service
* | | | | | | | | | | | | | Close streams immediately when we finish using themOren Hurvitz2014-07-211-28/+29
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Eliminated many warningsOren Hurvitz2014-04-231-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | In UuidGatherer, gather materials referenced in the prim's TextureEntryOren Hurvitz2014-02-011-2/+15
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahlia@nomail>
* | | | | | | | | | | | | Add back code to UuidGatherer to retrieve UUIDs for materials stored in ↵dahlia2014-01-201-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented
* | | | | | | | | | | | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-91/+47
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
* | | | | | | | | | | | Wrap analysis of the particle system in the UUID Gatherer in a separate ↵Justin Clark-Casey (justincc)2013-12-141-3/+12
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try/catch as sometimes it appears that this can be corrupt. As per Oren's suggestion.
* | | | | | | | | | | UUID Gatherer: find assets used in Light Projection, Particle Systems, and ↵Oren Hurvitz2013-09-191-1/+14
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collision Sounds.
* | | | | | | | | | Add materials store null check into UuidGatherer code.Justin Clark-Casey (justincc)2013-06-281-0/+4
| | | | | | | | | |
* | | | | | | | | | Reinsert code for gathering uuids reference by materials back directly into ↵Justin Clark-Casey (justincc)2013-06-281-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UuidGatherer for now. This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes. There needs to be some way for modules to register for events which are not connected with a particular scene.
* | | | | | | | | | refactor: Move code for gathering textures referenced by materials into ↵Justin Clark-Casey (justincc)2013-06-271-67/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MaterialsDemoModule from UuidGatherer This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
* | | | | | | | | | Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-271-8/+10
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc. All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace. This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors. This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release. However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
* | | | | | | | | UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | minor: change comment about assuming script references are textures in ↵Justin Clark-Casey (justincc)2013-02-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UuidGatherer since this is no longer the behaviour.
* | | | | | | | Log missing assets on "fcache assets" found. This ignores references found ↵Justin Clark-Casey (justincc)2013-02-021-2/+5
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by scanning LSL/notecard files since these are the source of false positives. This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures. This is added to help people in determining when they have missing assets such as textures, etc. In this case, one wants to run "fcache clear" first.
* | | | | | | minor: Rename assetCache constructor param in UUIDGatherer to assetService ↵Justin Clark-Casey (justincc)2012-10-201-2/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | which is what it is.
* | | | | | 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!
* | | | | Comment out the uuid gatherer lines that I accidentally left in.Justin Clark-Casey (justincc)2011-10-231-4/+4
| |_|_|/ |/| | |
* | | | Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-221-16/+22
| |_|/ |/| | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743
* | | minor: put <remarks> tags around some method docJustin Clark-Casey (justincc)2011-09-121-5/+6
| |/ |/|
* | Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-211-4/+14
| | | | | | | | This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
* | Try to fix a IAR problem reported by nebadon, where save iar seems stuck ↵Diva Canto2011-01-071-0/+4
|/ | | | forever.
* If we fail to gather asset uuids for a particular asset, log the failing ↵Justin Clark-Casey (justincc)2010-11-271-15/+25
| | | | asset id and type
* If the uuid gatherer fails to find the asset containing gesture metadata, ↵Justin Clark-Casey (justincc)2010-09-241-0/+7
| | | | | | | then simply return rather than generating an exception This matches existing behaviour, though better diagnostics for missing assets may be good later on. This addresses http://opensimulator.org/mantis/view.php?id=4977
* Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-1/+4
| | | | MapAndArray collection
* add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-211-3/+5
|
generated by cgit v1.1 at 2024-07-16 12:55:06 +0000