dahlia
5c593f3892
only cache mesh if meshing was successful
...
re-enable sculpt mesh caching
2009-10-04 20:01:44 -07:00
Melanie
a208f33c5d
Make the asset connector async Get overload return false if the asset
...
retrieval was not synchronous.
2009-10-05 00:23:47 +01:00
Diva Canto
362e94a022
* KeepAlive set to false in expect_user and log_off.
...
* Check for null SP in PermissionsModule.
2009-10-04 16:30:12 -07:00
Diva Canto
08d3650138
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-04 14:06:28 -07:00
Diva Canto
5b19d5a7b7
Reduced locking.
2009-10-04 14:05:58 -07:00
John Hurliman
a528e7704c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-04 13:58:22 -07:00
John Hurliman
29a4614529
* MySQL data tests now pass by fixing a bad fix for a bad cast on the asset Local member in MySQLAssetData
...
* First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass)
2009-10-04 13:57:51 -07:00
Diva Canto
022526661b
Just trying a few things. This one will reduce the number of async calls.
2009-10-04 13:38:12 -07:00
Diva Canto
d93e0a0503
Guarding a line that is sometimes throwing a null pointer exception.
2009-10-04 10:30:21 -07:00
Diva Canto
30aac00f6b
Closing more streams even if things fail.
2009-10-04 10:12:19 -07:00
Diva Canto
fe9cca64de
Stream needs to be closed before the file can be moved...
2009-10-04 09:56:54 -07:00
Diva Canto
b803d5ab9b
Make sure to close the file streams on the FlotsamCache, even if something fails.
2009-10-04 09:44:04 -07:00
Diva Canto
f21f3727df
Leaving the MemoryStreams unclosed.
2009-10-04 09:20:01 -07:00
Diva Canto
366bfe17ae
Trying to avoid the null pointer exception in J2KImage, RunUpdate.
2009-10-04 07:41:10 -07:00
dahlia
95ebb7794c
flexible extrusion shape defaults to linear
2009-10-04 02:59:12 -07:00
dahlia
efebc809ce
disable physics actors for flexible prims
2009-10-04 02:54:36 -07:00
dahlia
0cbd9eee2f
Exclude sculpt proxies from mesh caching
2009-10-04 02:14:13 -07:00
Melanie
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
Diva Canto
2d9c27a28f
Slightly better message with status code for WebException.
2009-10-03 20:18:21 -07:00
Diva Canto
b2cdee5a14
Better error handling to diagnose login problems.
2009-10-03 19:08:56 -07:00
Diva Canto
25e7697987
Fixed build order for Linux.
2009-10-03 16:33:10 -07:00
Diva Canto
b6920267f0
Close was being called to early on the Memory stream.
2009-10-03 16:27:55 -07:00
Diva Canto
b75b887798
Fixed interface between the Messaging server and the grid server.
2009-10-03 11:55:52 -07:00
Diva Canto
df7049008a
More streams closed.
2009-10-03 08:57:30 -07:00
Diva Canto
de94aa9bb5
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-03 08:46:25 -07:00
Diva Canto
e1112ff879
MOre streams closed. Corrected word in GridCommon.ini.example
2009-10-03 08:46:06 -07:00
Diva Canto
4843edfeb7
Closing more streams.
2009-10-03 08:33:19 -07:00
Melanie
874e423141
Fix my build break
2009-10-03 15:37:31 +01:00
Melanie
b4d1cf0009
Small permissions tweak
2009-10-03 14:22:29 +01:00
Diva Canto
006dfd6d9a
Closing another stream.
2009-10-02 20:35:15 -07: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
3ab6c89652
Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
2009-10-02 16:54:03 -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
Diva Canto
7a2ac292d6
Merge branch 'diva-textures-osgrid' of ssh://diva@opensimulator.org/var/git/opensim into diva-textures-osgrid
2009-10-02 16:24:13 -07:00
Diva Canto
e66321227e
Close streams in MakeRequest.
2009-10-02 16:23:46 -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
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
Melanie
6def897556
Merge branch 'diva-textures-osgrid' into diva-textures
2009-10-02 19:02:38 +01:00
Diva Canto
2e1c76f836
Added a default for grid services in standalone.
2009-10-02 07:18:36 -07:00
dr scofield (aka dirk husemann)
6c068eaf12
reducing script engine log spam
2009-10-02 12:38:13 +02:00
dr scofield (aka dirk husemann)
75a42e0459
reducing region DB log spam
2009-10-02 12:05:59 +02:00
dr scofield (aka dirk husemann)
3c271bf222
fixing TestLandChannel to let it return empty List<ILandObject>() (as
...
does the real LandChannel), percolating to SceneSetupHelpers.
2009-10-02 11:31:30 +02:00
dr scofield (aka dirk husemann)
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02: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