Commit Graph

27 Commits (03dbce1b42882bc588e9c1eea6e4659c6a4ef98c)

Author SHA1 Message Date
Adam Frisby 03dbce1b42 * Mergin, mergin. Keep ooon mergin! 2008-02-22 18:11:10 +00:00
lbsa71 c0252073d0 * removed another superfluous debug message 2008-01-09 09:31:07 +00:00
lbsa71 4b4ee98070 * Trying to address TextureSender issues
* The BlockingQueue exposes Contains so we can make sure we don't add a TextureSender to the queue if there's already one present
* introduced some TryGetValue and various code convention stuff
2008-01-02 09:07:11 +00:00
lbsa71 20653830fb * Refactored out function to load specified AssetSet Xml
This commit dedicated to 'Mohawk - Bad Girls (Need Love Too)'
2008-01-02 07:13:34 +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
lbsa71 efd90b56b7 * Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
2007-12-27 21:41:48 +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
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
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
Jeff Ames 712efda9b9 added copyright notices 2007-12-11 01:26:06 +00:00
Jeff Ames 946db5461c catch exceptions when loading malformed xml files 2007-11-17 05:53:12 +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
Sean Dague 21e47f8ef0 debug tracing for asset server hangs 2007-11-01 22:01:26 +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
lbsa71 67e12b95ea * Optimized usings
* Shortened type references
* Removed redundant 'this' qualifier
2007-10-30 09:05:31 +00:00
MW 3d8219f6c7 as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.
Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.
2007-10-29 21:46:25 +00:00
MW f6e8cbbd06 Fixed a bug in SQLAssetServer that only seemed to be a problem when running under the MS .net Runtime, but was fine with mono. 2007-10-29 15:58:52 +00:00
MW 0837f6b78d fixed one bug (where the assets we read and created from the OpenSimAssetSet.xml file, weren't actually getting added to the database). This should make textures/assets work again with db4o, but still seems a problem with sqlite 2007-10-29 14:37:08 +00:00
Tleiades Hax 5e7dba7268 Very early first implementation of grid based assets.
Run this on a major grid, and weep
2007-10-26 11:46:27 +00:00
Adam Frisby 5dad0ed729 * Return of R2162. /Take that SVN!/ 2007-10-22 21:57:32 +00:00
Sean Dague 6acaabefc3 revert r2162 as it completely clobbered all the work on
the ChatModule by MW and myself.  Couldn't find Adam online
after that rev went in.
2007-10-22 15:37:54 +00:00
Adam Frisby c4707a284f * Major ass commit.
* Sqlite Storage Engine now supports terrain -- however be aware that every terrain revision stored will at 512KB to your database file. At the moment it is storing every revision from the first.
* Fixed an issue where by noverbose mode would display lots of useless junk. Noverbose mode is now quite usable.
* Fixed a whole bunch of console message issues such as naming and categorisation
2007-10-22 15:23:48 +00:00
Sean Dague d4bb430f78 get rid of all the ^M line endings 2007-10-19 20:28:18 +00:00
lbsa71 656c72befc * some more refactoring + bugfix 2007-10-19 08:57:30 +00:00
lbsa71 46700d3b7d * Total refactoring of Asset Server for massive win
* There is now a AssetServerBase
* lolcat in ur assets
2007-10-19 07:46:03 +00:00