Melanie
e94574196f
Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge
2011-10-25 03:19:55 +01:00
Melanie
02f0aa592d
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
2011-10-25 03:19:10 +01:00
Justin Clark-Casey (justincc)
b868328d51
Comment out the uuid gatherer lines that I accidentally left in.
2011-10-23 03:14:32 +01:00
Justin Clark-Casey (justincc)
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
...
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-22 02:16:46 +01:00
Tom
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
Justin Clark-Casey (justincc)
517932722b
minor: put <remarks> tags around some method doc
2011-09-12 20:06:09 +01:00
Melanie
0c68fbdb1a
Merge branch 'master' into careminster-presence-refactor
2011-04-21 23:06:01 +01:00
Justin Clark-Casey (justincc)
63c1b7e475
Alter uuid gather so that it properly analyzes coalesced objects.
...
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.
2011-04-21 18:12:29 +01:00
Diva Canto
a1c5de0f94
Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever.
2011-01-07 12:32:47 -08:00
Justin Clark-Casey (justincc)
0e311a2104
If we fail to gather asset uuids for a particular asset, log the failing asset id and type
2010-11-27 00:54:09 +00:00
Justin Clark-Casey (justincc)
5bcf9ae2f9
If the uuid gatherer fails to find the asset containing gesture metadata, 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
2010-09-24 23:58:37 +01:00
John Hurliman
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
Justin Clark-Casey (justincc)
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
John Hurliman
b4dcdffb50
Fixed several unhandled exceptions and performance issues with 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
2010-03-16 11:50:22 -07:00
John Hurliman
33f5d0d1e9
* UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context
...
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
2010-03-15 14:17:17 -07:00
Diva Canto
908992a105
Fixes the broken build of the previous commit.
2009-12-23 17:10:37 -08:00
Melanie
53386b6f1f
Add saving assets from gestures to IAR
2009-12-23 23:09:41 +00:00
Justin Clark-Casey (justincc)
bb92ba97c6
Stop iar save failing on corrupt assets
...
Not ideal since one will still have to watch out for big 'corrupt asset' messages in the log, but better than an outright fail
2009-11-12 18:26:22 +00:00
Jeff Ames
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
Teravus Ovares
64bd9a3354
* Updates libOMV to version 0.7.0
...
* 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
2009-07-25 15:49:10 +00:00
Justin Clarke Casey
4234e49445
* minor: tiny tweak just to trigger another panda build
2009-06-05 19:53:24 +00:00
Justin Clarke Casey
ccbe049287
* A bug fix for the last mantis 3741 bugfix
...
* Hopefully now, the nre should not occur and the lock should be correctly unlocked during the initial save oar process
2009-06-05 19:34:35 +00:00
Justin Clarke Casey
fbd0f5491b
* A further fix for mantis 3641 (oar saves do not complete)
...
* 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 :)
2009-06-05 19:20:31 +00:00
Jeff Ames
840de6c036
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
diva
fb6d314d4d
This should make HG asset transfers work much better. It now uses 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
2009-05-23 17:51:13 +00:00
diva
5e4fc6e91e
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- 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
2009-05-15 05:00:25 +00:00
Justin Clarke Casey
fcfc97a4bf
* minor: rename xml sog serialization method for readability
2009-05-08 16:44:00 +00:00
Justin Clarke Casey
032e3b49eb
* refactor: Break out original xml object serialization into a separate class
...
* No functional change
2009-05-08 15:47:59 +00:00
Justin Clarke Casey
6cad71d5ec
* minor: remove load oar logging I accidentally left in a few commits ago
...
* reduce noisiness of uuid gatherer
* stop bothering to pointless complain about directory tar entries when loading an oar
2009-03-24 21:05:20 +00:00
Justin Clarke Casey
01f70de2ea
* Consistently lock part.TaskInventory as pointed out in 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
2009-02-20 14:04:29 +00:00
Justin Clarke Casey
4203cf1503
* refactor: Rename new class AssetGatherer to UuidGatherer to reflect what it actually does
2009-02-19 17:19:08 +00:00
