ec0aa7a90b
Fix up client implementations
2011-04-17 23:17:05 +02:00
dbf52b8cd1
Correct the delegate for classified deletes
2011-04-17 22:54:23 +01:00
0e3580066b
Merge branch 'master' into careminster-presence-refactor
2011-04-17 21:46:27 +01:00
03e725ad87
Mantis #5442 : Add admin_save_heightmap
2011-04-17 21:43:16 +01:00
c02e0e930d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-17 18:42:06 +02:00
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
2761810531
Fix the cert validation handler so that it will not block other parts of
...
the server doing ssl successfully.
2011-04-17 18:28:06 +02:00
5db8dcb563
Fix agent animation updates
2011-04-17 17:11:33 +02:00
70084c5e3a
More descriptive debug msg for ServiceOSDRequest failures.
2011-04-16 15:29:28 -07:00
3e0e1057ac
Remove the call to remove tokens from the parent. Under heavy load
...
this appears to cause problems with the system timer resolution.
This caused a problem with tokens going into the root throttle as
bursts leading to some starvation.
Also changed EnqueueOutgoing to always queue a packet if there
are already packets in the queue. Ensures consistent ordering
of packet sends.
2011-04-15 16:44:53 -07:00
cd6dce1108
Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't).
2011-04-15 16:42:40 -07:00
ed74be6599
Make remote admin error messages more helpful on windows.
...
Also, make log messages conform more with convention.
2011-04-15 23:54:30 +01:00
1dba671f45
refactor: separate out code that adds permissions
2011-04-15 23:32:46 +01:00
065d3f42c7
Merge branch 'master' of /home/opensim/lib/develop/BlueWall
2011-04-15 18:28:46 -04:00
fc365f2a31
Thanks Snoopy for a patch that allows setting of perms on items given to new avatars
2011-04-15 18:23:37 -04:00
9c7f14bf36
minor: remove a small amount of code duplication
2011-04-15 23:07:23 +01:00
98c5ed2c79
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-15 22:49:59 +01:00
52d9230392
refactor: split out some rez code into a separate CreateItemForObject() method
2011-04-15 22:47:47 +01:00
37d2b6243b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 21:16:30 -04:00
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
66a62678e5
get rid of all traces of the now used mock service infrastructure
2011-04-15 01:37:27 +01:00
631654a38d
remove old code for a mock grid service, which got removed some time back
2011-04-15 01:30:49 +01:00
ba73df39a3
remove any reference to a mock authentication service since it doesn't exist and we don't use it
2011-04-15 01:26:07 +01:00
54e8855819
remove mock asset service for tests in favour of always using the real one
2011-04-15 01:23:26 +01:00
79bd430e08
Remove the mock inventory service for tests and just use the real one all the time with an in-memory data plugin
2011-04-15 01:10:26 +01:00
ad70cddcfc
extend TestLoadCoalesecedItem() to check loaded object ids and positions
2011-04-15 00:56:40 +01:00
a0d80140f2
Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
...
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
821e67fb95
implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.
2011-04-14 20:59:52 +01:00
55387542ea
simplify InventoryArchiveTestCase setup
2011-04-14 20:35:00 +01:00
1569148b49
simplify TestSaveItemToIarV0_1()
2011-04-14 20:32:27 +01:00
e439264824
simplify TestRezObject()
2011-04-14 20:23:48 +01:00
c644ab6a2c
Make scene object parts created by the test utils unit sized.
2011-04-14 20:21:44 +01:00
4b05e667cb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 20:15:34 +01:00
22b307ea1c
Merge branch 'master' into queuetest
2011-04-14 11:59:25 -07:00
aaf9125869
simplify coalesced object tests by using existing scene object set up utils
...
this change makes it possible to set an absolute position on a group before it is put into a scene.
2011-04-14 17:33:55 +01:00
6ed6b46aad
Comment out the warning if the prioritizer runs without a fully
...
initialized scene presence. Not sure why we are dumping updates
to a client that isn't there yet...
2011-04-13 21:01:51 -07:00
590d20903c
Merge branch 'testmerge' into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
2011-04-13 15:41:17 -07:00
bf91d1b077
remove packet monitoring debugging code
2011-04-13 15:37:25 -07:00
b33aac737a
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-13 15:37:25 -07:00
5e7aba4f88
fixed a couple bugs with the property queues
2011-04-13 15:37:25 -07:00
3fe22126ca
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-13 15:37:25 -07:00
5b89c66c97
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-13 15:37:25 -07:00
4c62203b3b
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
2011-04-13 15:31:12 -07:00
c5465414b6
Use common coalesced serialization code for both tests and the InventoryAccessModule.
...
Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
2011-04-13 22:55:26 +01:00
c81f5bfc5c
Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers.
...
Extend test to check position of objects in the rezzed coalescence.
2011-04-13 22:29:12 +01:00
c0fcc430fe
Merge branch 'master' of /home/git/repo/OpenSim into queuetest
2011-04-13 17:03:30 -04:00
68cc5b46fe
refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer.
2011-04-13 21:48:16 +01:00
d8d28c3737
Fix bug where rezzing coalesced objects would give all objects the same name as the item.
...
This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
2011-04-13 21:31:45 +01:00
58efd761d1
Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.
...
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
2011-04-13 21:17:43 +01:00
dec9c2283b
Add ColladaMesh switch
2011-04-13 16:10:18 -04:00
Melanie