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
Melanie
36c8d55827
Merge branch 'diva-textures-osgrid'
2009-10-03 00:03:09 +01: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
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
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
Adam Frisby
a2cdbd784d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-02 10:54:01 +10: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
Adam Frisby
a030e3d61b
* Attempting to fix a issue with console commands & the estate module. Again.
2009-10-02 10:53:21 +10: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
Diva Canto
24d5b57503
Added messages to assertions in the failing tests, so that we know which ones are failing.
2009-10-01 17:28:42 -07:00
Melanie
4a1076128c
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-02 00:45:43 +01:00
Melanie
d6301db382
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
...
This reverts commit 39842eb4af
.
2009-10-02 00:45:31 +01:00
Diva Canto
ac0927c922
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-01 16:40:04 -07:00
Diva Canto
c8c4b4c505
Switched log level of an annoying message in SQLite to Debug, and commented it too.
2009-10-01 16:39:41 -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
7c1fdb2540
Add "dump asset" command to remote asset connector (the only one that uses a
...
cache at all)
2009-10-01 21:29:57 +01:00
Melanie
26478ff689
Add "dump asset" command to remote asset connector (the only one that uses a
...
cache at all)
2009-10-01 21:26:53 +01:00
Melanie
5e9da4daab
Add OnQueueEmpty event to the packet layers. No user functinality yet
2009-10-01 21:08:17 +01:00
Diva Canto
94783e9377
Catch and print exceptions in MessagingService, to diagnose mysterious disappearances of the Messaging server.
2009-10-01 09:17:22 -07:00
dr scofield (aka dirk husemann)
133a4a9906
- adding new LandDataSerializer testcase to "test-xml" target as well
...
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
dr scofield (aka dirk husemann)
05da73c300
fixing LandDataSerializer (yeah! for testcases)
2009-10-01 12:01:41 +02:00
dr scofield (aka dirk husemann)
18416ec518
Merge branch 'oar-parcel' into x-opensim
2009-10-01 10:30:43 +02:00
dr scofield (aka dirk husemann)
77ed8e977a
adding meat to the LandDataSerializerTest cases.
2009-10-01 10:30:26 +02:00
dr scofield (aka dirk husemann)
5b378a793b
Merge branch 'oar-parcel' into x-opensim
2009-10-01 09:48:30 +02:00
dr scofield (aka dirk husemann)
9dcf7da42a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-10-01 09:48:02 +02:00