BlueWall
dec9c2283b
Add ColladaMesh switch
2011-04-13 16:10:18 -04:00
Justin Clark-Casey (justincc)
08fd1d9bbd
factor out some test code into the SetUp()
2011-04-13 18:11:04 +01:00
Justin Clark-Casey (justincc)
6613daa82a
Add a regression test for rezzing a single object into a scene from user inventory
2011-04-13 17:46:36 +01:00
BlueWall
d3457eae7a
Merge branch 'master' of /home/git/repo/OpenSim
2011-04-13 09:53:44 -04:00
dahlia
90b810c27e
force mesh proxy for simple box prims with path cut
2011-04-12 22:47:30 -07:00
Diva Canto
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
Diva Canto
16c911dcbb
Implemented terrain save-tile command. Does the opposite of load-tile. For now, only saves to .png.
2011-04-12 19:46:27 -07:00
Diva Canto
5c870fce54
Bug fix in object serialization -- sculpt data was wrong.
2011-04-12 19:45:33 -07:00
Mic Bowman
b84ad81740
remove packet monitoring debugging code
2011-04-12 15:58:57 -07:00
Mic Bowman
78c04d61ca
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-12 15:58:57 -07:00
Mic Bowman
1a0f107012
fixed a couple bugs with the property queues
2011-04-12 15:58:57 -07:00
Mic Bowman
69d014e1dc
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-12 15:58:57 -07:00
Mic Bowman
2f43687589
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-12 15:58:57 -07:00
Mic Bowman
317617cfda
remove packet monitoring debugging code
2011-04-12 15:55:21 -07:00
Mic Bowman
80ba3de902
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-12 15:40:57 -07:00
Justin Clark-Casey (justincc)
424995e138
Move example HttpProxy setting to OpenSim.ini.example and tidy
2011-04-12 23:22:21 +01:00
Justin Clark-Casey (justincc)
bed463666c
minor typo correction. thanks Ai Austin.
2011-04-12 23:16:43 +01:00
Mic Bowman
7fa085b3fa
fixed a couple bugs with the property queues
2011-04-12 14:40:57 -07:00
Justin Clark-Casey (justincc)
da4a9653a2
minor: remove some mono compiler warnings
2011-04-12 22:33:06 +01:00
Justin Clark-Casey (justincc)
b0889ed92a
refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte
2011-04-12 22:30:43 +01:00
Justin Clark-Casey (justincc)
8e0d2cc43b
If an object is rezzed directly from a prim inventory then give it the rotation it was stored with.
2011-04-12 22:21:46 +01:00
Justin Clark-Casey (justincc)
3ba5eeb6c3
Allow a null rotation to be passed in to RezObject so that we can control whether to use the serialized rotation or not. Not used yet.
2011-04-12 22:15:40 +01:00
Mic Bowman
3afddb9033
Merge branch 'test-select' into queuetest
2011-04-12 12:39:02 -07:00
Mic Bowman
0e97629ee7
Merge branch 'master' into queuetest
2011-04-12 12:38:47 -07:00
Mic Bowman
095e602c4a
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-12 12:36:36 -07:00
Justin Clark-Casey (justincc)
98d7de22dc
Fix (add) ability to rez objects by dragging them out of another prim's inventory.
...
This should happen if the client supplies a task ID with the RezObject call.
The rez goes through the same code as llRezObject(), so the same perms are applied.
Rotation isn't yet preserved, this should be fixed shortly.
2011-04-12 18:31:41 +01:00
Sean McNamara
049bce4d00
Fixup the global defaults config parsing code.
2011-04-12 01:14:21 -04:00
Melanie
42b96a8be0
Merge branch 'master' into careminster-presence-refactor
2011-04-12 00:27:39 +01:00
Justin Clark-Casey (justincc)
621d5b58e1
minor: add a bit more method doc to IInventoryService.GetItem()
2011-04-11 23:56:04 +01:00
Justin Clark-Casey (justincc)
49d80f5711
Include code to return more information about the NullReferenceException seen in
...
http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it.
2011-04-11 23:07:56 +01:00
Justin Clark-Casey (justincc)
64dc7e9f14
minor: remove now inaccurate comment
2011-04-11 22:35:07 +01:00
Justin Clark-Casey (justincc)
e8ecb2898c
minor: remove some mono compiler warnings
2011-04-11 22:33:24 +01:00
Justin Clark-Casey (justincc)
3a98fb080a
minor: adjust some spacing and indentation
2011-04-11 22:29:08 +01:00
E. Allen Soard
464fa45ec9
Implimented HTTP_VERIFY_CERT for llHttpRequest
2011-04-11 22:22:11 +01:00
Justin Clark-Casey (justincc)
333a2913cf
slightly tweak OpenSim.ini.example text
2011-04-11 22:02:12 +01:00
Justin Clark-Casey (justincc)
0bd6bc8fba
create "config show" as a region console command synonym for "config get".
...
This is to create greater consistency with all the other show commands.
2011-04-11 21:59:26 +01:00
Justin Clark-Casey (justincc)
d6948b15c4
Make it more obvious when it happens that DLL plugin loading fails. Improve exception output on Windows.
2011-04-11 21:51:17 +01:00
Justin Clark-Casey (justincc)
fda393b088
Add information comment to top of OpenSimDefaults.ini and make file consistent
2011-04-11 21:42:28 +01:00
Justin Clark-Casey (justincc)
e9c2beadec
Add more instructions to OpenSim.ini.example to try and make it more understandable for new users.
2011-04-11 20:43:11 +01:00
Sean McNamara
95a6ee0a37
Fix NREs harder.
2011-04-11 13:20:46 -04:00
Sean McNamara
4ad05fb01d
Fix some NREs on certain paths.
2011-04-11 13:12:26 -04:00
Sean McNamara
4974a1ce69
AutoBackup: Support region-independent settings too.
2011-04-11 12:34:26 -04:00
Mic Bowman
6e9cdb9ce3
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-11 09:06:28 -07:00
Mic Bowman
72a24cf023
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/Prioritizer.cs
2011-04-11 08:41:36 -07:00
Mic Bowman
f778056c7a
Removed some priority queue debugging code
2011-04-11 08:37:43 -07:00
Mic Bowman
ebc249e3be
Changed the "not in scene" check in the prioritizier to just
...
a warning. There appears to be a race condition on slow logins
that attempts to prioritize before the scene presence is fully
initialized.
2011-04-10 17:02:40 -07:00
Mic Bowman
19c6d1d569
Split the priority queue class into a seperate file. LLClientView
...
is big enough.
2011-04-10 16:57:02 -07:00
Mic Bowman
83dc2470f2
Fix a bug in the computation of the RTO. Basically... the RTO (the
...
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
2011-04-10 16:57:02 -07:00
Mic Bowman
0bd06d8ba8
Fixed the prioritizer functions for the new priority queues
2011-04-10 16:57:02 -07:00
Mic Bowman
77cf9405de
Implements adaptive queue management and fair queueing for
...
improved networking performance.
Reprioritization algorithms need to be ported still. One is
in place.
2011-04-10 16:57:02 -07:00