ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 02:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,597 Commits 5 Branches 93 Tags
d93e0a05037495dcdabdffcc9b9f78747271da39
Commit Graph

1173 Commits

Author SHA1 Message Date
Diva Canto
d93e0a0503 Guarding a line that is sometimes throwing a null pointer exception. 2009-10-04 10:30:21 -07:00
Diva Canto
366bfe17ae Trying to avoid the null pointer exception in J2KImage, RunUpdate. 2009-10-04 07:41:10 -07:00
Melanie
6878b26b0d Merge branch 'diva-textures-osgrid' 2009-10-04 05:49:16 +01:00
John Hurliman
387e9f7a7f * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework) 
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
 2009-10-02 18:31:08 -07:00
John Hurliman
332d3eb1bb * Removed code that is no longer used with Melanie's queue callback optimization 
* Moved all priority queue access to helper functions to improve reliability and readability
* New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug
 2009-10-02 16:53:35 -07:00
Melanie
36c8d55827 Merge branch 'diva-textures-osgrid' 2009-10-03 00:03:09 +01:00
Melanie
73fa409318 Merge branch 'diva-textures-osgrid' 2009-10-02 23:25:17 +01:00
John Hurliman
bdc1345501 * Removed even more unnecessary state variables from J2KImage 
* Fixed the incorrect "out of memory?" exception messages and replaced them with useful information
* Cleaned up J2KImage and LLImageManager to conform to coding conventions
 2009-10-02 13:08:15 -07:00
John Hurliman
9b342d3e0d * Changed the flush logic to drop packets in non-transactional streams, and to not fire any "put more data in the queues" callbacks 
* Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow
 2009-10-02 12:00:42 -07:00
Melanie
6def897556 Merge branch 'diva-textures-osgrid' into diva-textures 2009-10-02 19:02:38 +01:00
Melanie
31d8cec0f8 Merge branch 'master' into diva-textures 2009-10-02 08:23:38 +01:00
Melanie
3ba36bb4d8 Restore the missing image handling to the image manager. The missing 
image packet crashes Hippo without a message.
 2009-10-02 05:49:27 +01:00
Melanie
9a429610e2 Merge branch 'diva-textures-osgrid' into texturetest 2009-10-02 04:19:22 +01:00
Diva Canto
746dad7b74 Locking the priority queue to see if it gets pass that exception. 2009-10-01 20:32:22 -07:00
Melanie
18a744cac1 Change texture sending to be driven by the queue empty event from the 
packet queue, rather than a timer
 2009-10-02 04:04:14 +01:00
John Hurliman
54ff84050f Removing console debug spew 2009-10-01 18:12:13 -07:00
John Hurliman
aaf8fbcef9 Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid 2009-10-01 17:53:28 -07:00
John Hurliman
6e0c79b8fe * Rewrote LLImageManager to use a real priority queue and hold minimal state 
* Rewrote the logic in J2KImage.RunUpdate()
* Added a default avatar texture (I made it myself)
 2009-10-01 17:42:13 -07:00
Melanie
54a912bb9c Add a method to determine the count of packets in a throttle 2009-10-01 22:35:57 +01:00
Melanie
5e9da4daab Add OnQueueEmpty event to the packet layers. No user functinality yet 2009-10-01 21:08:17 +01:00
James J Greensky
44776fea72 Fixing LLClientView memory leak 
Fixing LLClientView memory leak by disposing of all timers utilized
in LLClientView as they contain references to the callback method.
This required the use of the Terminate and Close infrastructure that
was already in place but was not being utilized.
 2009-10-01 04:11:32 +01:00
Jeff Ames
606e831ff5 Formatting cleanup. 2009-10-01 09:38:36 +09:00
John Hurliman
5dfd2643df * Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes 
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
 2009-09-30 15:53:03 -07:00
Melanie
041aaaa62c Prevent null data being sent to the decoder 2009-09-30 22:21:22 +01:00
Melanie
400abed271 Add RebakeAvatarTexturesPacket to the client view 2009-09-30 21:33:20 +01:00
Melanie
b0c0d6f9d1 Squelch the debug noise from diva's patch 2009-09-30 20:36:20 +01:00
John Hurliman
f56dc5fcda Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory 
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K

* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
 2009-09-30 19:26:53 +01:00
Diva Canto
4bf47fa592 This releases the texture assets from LLImageManager cache, and re-requests them later if the client asks for them again. Needs more testing in texture-rich sims. 2009-09-30 18:41:41 +01:00
Jeff Ames
ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Diva Canto
5d09c53a1a Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules. 2009-09-27 10:14:10 -07:00
Adam Frisby
5dc3e560d3 * Makes SimulatorEnable messages 'reliable' and subject to redelivery. 2009-09-23 10:30:18 +10:00
Jeff Ames
c41387b864 Formatting cleanup. 2009-09-10 15:57:53 +09:00
Teravus Ovares (Dan Olivares)
c605509da3 * Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only. 2009-09-09 16:20:19 -04:00
Diva Canto
b03eeeb9f6 * Fixes mantis http://opensimulator.org/mantis/view.php?id=4044. Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set. 
* Removed left-overs from AssetInventoryServer.
 2009-08-22 10:24:26 -07:00
Diva Canto
9e64427262 Putting the inventory packets back to ThrottleOutPacketType.Asset, because that didn't work. 2009-08-20 21:56:06 -07:00
Diva Canto
922007443e Changed most of inventory packets to LowPriority, to see if that helps with freezing on searching large inventories. 2009-08-20 21:36:57 -07:00
Diva Canto
118f710a79 Fixed a missing field in SendBulkInventoryFolderUpdate. 2009-08-20 16:18:32 -07:00
Diva Canto
d519f1885f Added MoveItems, which is most useful upon viewer-delete inventory operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently). 2009-08-19 10:56:08 -07:00
Diva Canto
c5af39239f A better purge of trash folder. 2009-08-19 00:13:51 -07:00
Diva Canto
124f66bfc2 jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024 2009-08-18 22:17:47 -07:00
dahlia
465d1095dd Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides user's viewer network throttle settings 2009-08-18 17:06:14 -07:00
Melanie
9ad3e72ae1 Did I say that i don't like git? Remove some stuff that shouldn't have 
gone in.
 2009-08-17 22:06:51 +01:00
Diva Canto
fa8a94577a Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-08-17 05:55:38 -07:00
Melanie
644db1e540 Add System.Xml reference to the console project 2009-08-17 09:40:38 +01:00
Teravus Ovares (Dan Olivares)
acc14c472d Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-08-16 12:15:14 -04:00
Teravus Ovares (Dan Olivares)
5e391b9f7c * ShortVersion, another attempt at fixing the test thread death that randomly occurs. 
* LongVersion nIni may be causing the test thread death.  Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users.  It might be because when it's in pause mode, something else reads from the nini config passed?   If it is, it might not be fixable..   however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time.
 2009-08-16 12:14:49 -04:00
Diva Canto
6808b9109e Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector 2009-08-16 08:59:58 -07:00
Adam Johnson
a42569d896 Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet Handler - ref mantis #4010 2009-08-16 15:06:06 +09:00
Diva Canto
034c9cf606 Added GetAssetPermissions. Few last bugs nixed. This is ready for testing. 2009-08-13 17:34:15 -07:00
Diva Canto
5246dc33dc Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves. 2009-08-13 14:10:12 -07:00