| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 1 | -0/+66 |
| |\ | |||||
| | * | UUIDGatherer now includes UUIDs which reference texture assets used as materials | dahlia | 2013-04-24 | 1 | -0/+66 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 1 | -3/+7 |
| |\ \ | |/ | |||||
| | * | minor: change comment about assuming script references are textures in ↵ | Justin Clark-Casey (justincc) | 2013-02-02 | 1 | -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-02 | 1 | -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. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | minor: Rename assetCache constructor param in UUIDGatherer to assetService ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -2/+2 |
| | | | | | | | | | which is what it is. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -46/+90 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | This fixes HG attachments' missing assets (textures, etc). | Diva Canto | 2012-09-21 | 1 | -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 Canto | 2012-09-21 | 1 | -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-21 | 1 | -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-21 | 1 | -40/+44 |
| | | | | | | | | | using the async call but waiting for completion anyway! | ||||
| * | | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
| |\ \ | |/ | |||||
| | * | Comment out the uuid gatherer lines that I accidentally left in. | Justin Clark-Casey (justincc) | 2011-10-23 | 1 | -4/+4 |
| | | | |||||
| * | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 1 | -16/+22 |
| |\ \ | |/ | |||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -16/+22 |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | ||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -5/+6 |
| |\ \ | |/ | |||||
| | * | minor: put <remarks> tags around some method doc | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -5/+6 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -4/+14 |
| |\ \ | |/ | |||||
| | * | Alter uuid gather so that it properly analyzes coalesced objects. | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -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 Canto | 2011-01-07 | 1 | -0/+4 |
| |/ | | | | forever. | ||||
| * | If we fail to gather asset uuids for a particular asset, log the failing ↵ | Justin Clark-Casey (justincc) | 2010-11-27 | 1 | -15/+25 |
| | | | | | asset id and type | ||||
| * | If the uuid gatherer fails to find the asset containing gesture metadata, ↵ | Justin Clark-Casey (justincc) | 2010-09-24 | 1 | -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 Hurliman | 2010-09-16 | 1 | -1/+4 |
| | | | | | MapAndArray collection | ||||
| * | add prim item and test asset save in save oar unit test | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -3/+5 |
| | | |||||
| * | Fixed several unhandled exceptions and performance issues with ↵ | John Hurliman | 2010-03-16 | 1 | -11/+12 |
| | | | | | PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time | ||||
| * | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵ | John Hurliman | 2010-03-15 | 1 | -14/+15 |
| | | | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file | ||||
| * | Fixes the broken build of the previous commit. | Diva Canto | 2009-12-23 | 1 | -1/+2 |
| | | |||||
| * | Add saving assets from gestures to IAR | Melanie | 2009-12-23 | 1 | -1/+41 |
| | | |||||
| * | Stop iar save failing on corrupt assets | Justin Clark-Casey (justincc) | 2009-11-12 | 1 | -1/+3 |
| | | | | | Not ideal since one will still have to watch out for big 'corrupt asset' messages in the log, but better than an outright fail | ||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -6/+6 |
| | | |||||
| * | * Updates libOMV to version 0.7.0 | Teravus Ovares | 2009-07-25 | 1 | -0/+1 |
| | | | | | | | | | * Uses mantis #3811 as a base (thanks jhuliman) with changes. * E-mail regarding interface changes sent to the opensim-dev list * Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html | ||||
| * | * minor: tiny tweak just to trigger another panda build | Justin Clarke Casey | 2009-06-05 | 1 | -1/+1 |
| | | |||||
| * | * A bug fix for the last mantis 3741 bugfix | Justin Clarke Casey | 2009-06-05 | 1 | -10/+7 |
| | | | | | | | * Hopefully now, the nre should not occur and the lock should be correctly unlocked during the initial save oar process | ||||
| * | * A further fix for mantis 3641 (oar saves do not complete) | Justin Clarke Casey | 2009-06-05 | 1 | -12/+15 |
| | | | | | | | | | * For some reason, if a null was recieved (indicating a missing asset), the code had stopped passing that on to the waiting lock, resulting in a perpetual freeze * This change passes the null on correctly * Many thanks to thomax for being insistent in presenting his analysis of the problem :) | ||||
| * | Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵ | Jeff Ames | 2009-06-01 | 1 | -1/+1 |
| | | | | | LICENSE.txt. | ||||
| * | This should make HG asset transfers work much better. It now uses ↵ | diva | 2009-05-23 | 1 | -1/+1 |
| | | | | | HGUuidGatherer, which is a subclass of UuidGatherer. Hence, on-line HG asset transfers use exactly the same UUID collection code as save oar/xml. If it doesn't work, it's Justin's fault :D | ||||
| * | Heart surgery on asset service code bits. Affects OpenSim.ini configuration ↵ | diva | 2009-05-15 | 1 | -3/+10 |
| | | | | | | | | | | | | | -- please see the example. Affects region servers only. This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing. Known problems: * HG asset transfers are borked for now * missing texture is missing * 3 unit tests commented out for now | ||||
| * | * minor: rename xml sog serialization method for readability | Justin Clarke Casey | 2009-05-08 | 1 | -1/+1 |
| | | |||||
| * | * refactor: Break out original xml object serialization into a separate class | Justin Clarke Casey | 2009-05-08 | 1 | -1/+2 |
| | | | | | | | * No functional change | ||||
| * | * minor: remove load oar logging I accidentally left in a few commits ago | Justin Clarke Casey | 2009-03-24 | 1 | -2/+2 |
| | | | | | | | | * reduce noisiness of uuid gatherer * stop bothering to pointless complain about directory tar entries when loading an oar | ||||
| * | * Consistently lock part.TaskInventory as pointed out in ↵ | Justin Clarke Casey | 2009-02-20 | 1 | -2/+4 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=3159 * Not locking causes enumeration exceptions as described in this matis * part.TaskInventory needs to be locked for every access as it's a dictionary * Extra locking will hopefully not cause any major issues - in places where the enumeration of the dictionary performs other lock or long running operations, the dictionary is cloned instead | ||||
| * | * refactor: Rename new class AssetGatherer to UuidGatherer to reflect what ↵ | Justin Clarke Casey | 2009-02-19 | 1 | -0/+269 |
| it actually does | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |