Commit Graph

127 Commits

Author SHA1 Message Date
Justin Clarke Casey
b8975ecbd9 Make it possible for new inventory 'libraries' to be added without changing the default OpenSimLibrary files. Additional library folders and items can be added in a separate
directory 
and linked in by an entry to inventory/Libraries.xml
2007-12-31 23:20:49 +00:00
Justin Clarke Casey
60fa75ac04 Standard library folders can now be configued in the xml in inventory/OpenSimLibrary - no hardcoded changes are required. For some reason, all the folders are currently
showing up as texture folders, even though they are configured with the same types as the agent inventory folders.  This should be resolved soon.
2007-12-31 03:33:21 +00:00
Justin Clarke Casey
7d04cf8d4e Shift default OpenSim library into its own directory 2007-12-30 19:05:11 +00:00
Justin Clarke Casey
40e89678b7 Make inventory items nominate explicit inventory folders rather than hardcoding 2007-12-29 19:41:50 +00:00
Justin Clarke Casey
4ae10034bd Factor out common asset loading from AssetServerBase and Grid/AssetServer/Main 2007-12-28 22:13:43 +00:00
Justin Clarke Casey
7cf9a8d4f9 Move inventory contents configuration files to bin/inventory folder 2007-12-28 18:01:20 +00:00
lbsa71
efd90b56b7 * Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
2007-12-27 21:41:48 +00:00
Justin Clarke Casey
997a2907e2 Move hardcoded texture library inventory items out into OpenSimLibrary/xml. However, even before these change the five textures moved
are not displaying (which is why default cubes are coming up as grey plywood unless you happen to have that texture cached).  These
were working before so they must have broken in the last month.  Might be something to do with the fact that these identify (using file
under linux) as jpeg2000 files, while all the other working textures identify simply as data.
2007-12-27 15:17:22 +00:00
lbsa71
87e2a694e2 * AssetServerBase: _ProcessRequest is now called GetAsset
* PrimitiveBaseShape: The textures are now exposed as a 'TextureEntry Textures'; all serialization still using the 'byte[] TextureEntry' for backwards compatibility.
* Scene: Re-added AddTree, since the Tree type isn't gone from libsl, merely relocated.
2007-12-27 14:00:30 +00:00
Justin Clarke Casey
77a2755e14 Yet more inventory debugging messages 2007-12-23 11:43:46 +00:00
Justin Clarke Casey
c545cc8cd9 Miscellaneous small tweaks and more logging messages to move towards resolving inventory problems 2007-12-23 02:14:29 +00:00
Justin Clarke Casey
c470efea57 Make copying of scripts into prim inventories more reliable on the first attempt when the asset server is lagging by formalising the de facto polling.
This may not be the best solution in the long run, but should improve things for now.
This may also improve reliability when updating inventory item metadata (e.g. renaming an item) and in retrieving textures
for the main map view.
2007-12-22 19:48:01 +00:00
Justin Clarke Casey
ed0f8bd572 minor refactor 2007-12-22 16:45:44 +00:00
Justin Clarke Casey
42bc256e4f Refix bug where inventory textures don't appear in prim edit texture selection box
unless previously expanded in inventory.
2007-12-21 19:47:45 +00:00
Jeff Ames
be2ad79e52 Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532 2007-12-20 05:43:02 +00:00
Justin Clarke Casey
45567b71b8 Refactor asset request processing for consistent status information on whether an asset was actually found or not 2007-12-19 18:05:45 +00:00
Jeff Ames
6702b03733 Misc. cleanup:
* added Util.Clip(value, min, max)
* modified asset cache's numPackets calculation to use max packet size (600) instead of 1000
* removed a few magic numbers
2007-12-19 08:44:25 +00:00
Brian McBee
8a8c89a0f3 Grid Inventory feature upgrade: renaming folders should now be correct, subfolders work, moving folders works.
Tested only in MYSQL, but may work in MSSQL and sqlite.
Probably not working in standalone mode.
2007-12-15 04:57:14 +00:00
Charles Krinke
4e7763f8de Thank you Justin for:
0000188: Clean up of some AssetCache.ProcessAssetQueue() code
2007-12-14 20:09:44 +00:00
lbsa71
9ed2b26232 * Just making Create public 2007-12-14 15:29:51 +00:00
lbsa71
0a4a5bbcef * ARequest changed name to AssetRequest and moved to own file.
* The AssetServerBase is now responsible for dequeueing, the server implementations merely recieves ProcessRequest( AssetRequest req )
* Catchall added around queue processing thread so thread won't abort on exceptions.
2007-12-14 08:47:15 +00:00
Teravus Ovares
fef8c77a8a patch from justincc for Mantis #163 - Opening a script in inventory longer than 1500characters can cause looping crash. 2007-12-14 00:54:12 +00:00
Brian McBee
16903ec488 Implementing updateinventoryfolder: Should now be able to rename folders in inventory 2007-12-11 03:51:32 +00:00
Jeff Ames
712efda9b9 added copyright notices 2007-12-11 01:26:06 +00:00
MW
611327e104 more work on texture downloading.
Refractored the TextureDownloadModule (but currently to make debugging easier, it is running as a non shared module, so this results in a instance of this module being created for each region (and a extra thread per region), this will be changed back soon.
Removed the old texture handling/sending code from AssetCache.
A few other small changes/fixes.
2007-12-10 13:27:23 +00:00
Jeff Ames
af6eb67999 saved OpenSim source code from the giant rampaging unterminated copyright notice of doom 2007-12-10 05:25:16 +00:00
Brian McBee
383eccc543 hackish code to allow emptying of trash. This really should be done on the inventory server, and not from the region.
Also: it appeared to work the first try, so I have probably done something horribly wrong.
2007-12-08 20:41:37 +00:00
Sean Dague
1ad83bcf1b reversing the r2599 patch, as this started causing CreateThread errors for
me on Mono 1.2.4, which led to client crashes.  I think the Timer.Stop() 
wasn't doing what was desired on Mono.  The Queue refactoring should address
the readability issues lbsa71 was working on as soon as I get the merge together.
2007-12-06 20:13:02 +00:00
lbsa71
395637acdd * now the throttle timer is stopped whilst processing Queue so that it won't fire twice
* started to refactored throttling method
* some code convention refactorings
2007-12-06 14:08:22 +00:00
Sean Dague
c29105aa3e This is a simple patch which just renames an IClientAPI method to
SendInventoryItemCreateUpdate() in order to reflect the actual packet it
sends (UpdateCreateInventoryItem).

From Justin Casey (IBM)
2007-12-03 17:24:27 +00:00
MW
ac77c32453 Attempt to fix mantis issue #82, taking prims into inventory and then rezzing them in another region. 2007-12-02 20:43:21 +00:00
MW
cac98171e5 Very partial Avatar Appearance (ie, clothes/body parts) "storage". In standalone mode it will mean that when you log off and log back on ,as long as the region server hasn't been restarted , your avatar will start with wearing the clothes that it wore on log off. In grid mode its even more limited in that wearing/removing clothes/body parts are only stored in the region server instance you are one. so if you are in a different region to your login region (which are on different region server instances), and then change clothes, those changes won't be remembered. So as said, its very limited but is a small step towards having proper appearance persist.
Just need to store this data out to a database.
2007-12-02 14:56:23 +00:00
MW
86ae8e97cd Fixes a bug that my last commit introduced. 2007-12-02 14:12:56 +00:00
MW
80609c2b15 Some refactoring , mainly on Inventory code. 2007-12-02 13:59:15 +00:00
MW
b92df4aaaf New Inventory folder should now be stored to the inventory server/database. This also seems to fix the problem of Body parts not being persisted properly. 2007-12-02 10:21:17 +00:00
MW
4dee53c7fb Attempt to fix mantis issue # 73 2007-12-01 20:57:14 +00:00
MW
fff468dcfe Attempt to fix mantis issue # 65, seems like it is a race condition between two regions trying to add a user to the AssetTransactionManager at the same time. So have placed a lock around the Dictionary add. 2007-12-01 16:40:26 +00:00
Sean Dague
b167507e32 Patch for mantis 0000015: Textures don't display in the object
properties window

From Justin Casey (IBM)
2007-11-30 20:16:40 +00:00
lbsa71
fb2588b409 * Refactored NumPackets calculation 2007-11-23 13:21:39 +00:00
Teravus Ovares
615b40b68b * Refactored IClientAPI.OutPacket to require a second mandatory parameter. This parameter has an enum:int ThrottleOutPacketType and contains types; Resend, Land, Wind, Cloud, Task, Texture, and Asset. 2007-11-18 15:54:05 +00:00
Jeff Ames
d10c79d421 first stab at implementation of CopyInventoryItem 2007-11-18 13:50:46 +00:00
Jeff Ames
946db5461c catch exceptions when loading malformed xml files 2007-11-17 05:53:12 +00:00
Brian McBee
46fbcad2aa Fixed bug in assetcache where certain textures were not being packetized correctly 2007-11-11 00:11:34 +00:00
lbsa71
ee1fcc729c * Added better logging to AssetCache
* AssetCache now ignores duplicate uploads
* some m_ refactoring
* ignored some bins
2007-11-06 11:10:45 +00:00
MW
19fe9a0208 Do I really have to write a log entry, can't I just hide this commit somewhere so its added but doesn't show up anywhere. As I can't believe I would make such a stupid mistake and not notice. 2007-11-04 10:40:28 +00:00
MW
91c2c3c096 testing different rest post method/class for Grid asset client. (possible that I haven't set the post url correctly) 2007-11-03 14:04:59 +00:00
Sean Dague
21e47f8ef0 debug tracing for asset server hangs 2007-11-01 22:01:26 +00:00
lbsa71
4fad66f855 * Diuerse beavtificatems 2007-11-01 19:19:05 +00:00
MW
7a66eff8af renamed FetchAsset to RequestAsset on IAssetServer, as think its a more fitting name. As the call shouldn't actually return the data, but just add a request for the data to be sent back via the callback. 2007-11-01 17:28:38 +00:00
MW
88f04731ca Test on the grid asset problem, don't update to this version unless you just want to test to see if this fixes anything (but it could just as well break grid assets even more). 2007-11-01 15:54:59 +00:00