Commit Graph

15259 Commits (6574690c7bf3bf03e3e368f57eb4a19aec511c7c)

Author SHA1 Message Date
Dan Lake b5ab33b5e1 bug fix. Now when an unacked update packet is handled through ResendPrimUpdates, it is removed from the UnackedPacketCollection. 2011-04-20 23:08:51 -07:00
Mic Bowman 7759bda833 Added an "immediate" queue to the priority queue. This is
per Melanie's very good suggestion. The immediate queue is
serviced completely before all others, making it a very good
place to put avatar updates & attachments.

Moved the priority queue out of the LLUDP directory and
into the framework. It is now a fairly general utility.
2011-04-20 21:58:49 -07:00
Huaiyu (Kitty) Liu b182e3bf30 In SyncLinkObject and SyncDelinkObject, copy property values from linked/delinked SOP
values to those in PrimSyncInfo, before sending out sync messages.
2011-04-20 17:34:55 -07:00
Mic Bowman 294b49ca3d Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
Conflicts:
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
2011-04-20 16:28:33 -07:00
Mic Bowman 2b737c9cc2 Adds the first pass at an adaptive throttle to slow start new
clients. If the sent packets are ack'ed successfully the throttle
will open quickly up to the maximum specified by the client and/or
the sims client throttle.

This still needs a lot of adjustment to get the rates correct.
2011-04-20 16:23:33 -07:00
Huaiyu (Kitty) Liu 1c1d3893fc DelinkFromGroup now calls AddNewSceneObjectByDelink, to avoid calling SyncNewObject later.
Also, replace all "SYMMETRIC SYNC" with "DSG SYNC" in comments.
2011-04-20 14:59:06 -07:00
dahlia 212326eeb0 fix meshing failure on sculpt maps smaller than 64x64 2011-04-19 22:16:10 -07:00
Justin Clark-Casey (justincc) ccc26f7443 Get Viewer 2 voice working with OpenSim.
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php.  This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php.  This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
opensim 4319d974b2 Added DSG to version string 2011-04-19 16:02:38 -07:00
Huaiyu (Kitty) Liu a5ebd04d9d Fixed code in SyncDeLinkObject and HandleSyncDelinkObject. Delinking a few linked objects seems working. 2011-04-19 15:55:04 -07:00
Huaiyu (Kitty) Liu 3676b5fbef 1. Replaced SendLinkObject and SendDeLinkObject with SyncLinkObject and SyncDeLinkObject
2. Replaced HandleLinkObject and HandleDelinkObject with HandleSyncLinkObject and HandleSyncDelinkObject.
LinkObject seems sync'ed well across actors.
2011-04-19 14:49:47 -07:00
Justin Clark-Casey (justincc) b786860bac synchronize Robust.HG.ini.example FreeSWITCH config with other config files 2011-04-19 22:38:43 +01:00
Justin Clark-Casey (justincc) 575257f3fe For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. Thanks for the spot, Ai Austin. 2011-04-19 21:58:55 +01:00
Justin Clark-Casey (justincc) 2fa210243b Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages. 2011-04-19 21:54:26 +01:00
Dan Lake da6044b6be Merge branch 'master' into dev
Conflicts:
	OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-04-19 11:52:25 -07:00
Mic Bowman 82de87ce99 Converted the property request queue to use the same retransmission
mechanism as the entity update queues.
2011-04-19 11:22:04 -07:00
Huaiyu (Kitty) Liu 3d7cece491 Include serialization of Scale in SOP.Shape (it's a sub property in Shape, and also a seperate SOP property,
both pointing to the same copy), so that now serialization of Shape has all its sub properties.
2011-04-19 11:11:14 -07:00
Huaiyu (Kitty) Liu 85085977ac Fixed a bug in ScheduleTerseUpdate, and added a few debug lines. 2011-04-19 09:52:55 -07:00
Dan Lake 08d8a3e580 Requeue unacknowledged entity updates rather than resend then "as is".
Often, by the time the UDPServer realizes that an entity update packet
has not been acknowledged, there is a newer update for the same entity
already queued up or there is a higher priority update that should be
sent first. This patch eliminates 1:1 packet resends for unacked entity
update packets. Insteawd, unacked update packets are decomposed into the
original entity updates and those updates are placed back into the
priority queues based on their new priority but the original update
timestamp. This will generally place them at the head of the line to be
put back on the wire as a new outgoing packet but prevents the resend
queue from filling up with multiple stale updates for the same entity.
This new approach takes advantage of the UDP nature of the Linden protocol
in that the intent of a reliable update packet is that if it goes
unacknowledge, SOMETHING has to happen to get the update to the client.
We are simply making sure that we are resending current object state
rather than stale object state.

Additionally, this patch includes a generalized callback mechanism so
that any caller can specify their own method to call when a packet
expires without being acknowledged. We use this mechanism to requeue
update packets and otherwise use the UDPServer default method of just
putting expired packets in the resend queue.
2011-04-19 08:10:01 -07:00
Dan Lake f47d1c84cb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-18 22:14:35 -07:00
Dan Lake 6e4d970dae Requeue unacknowledged entity updates rather than resend then "as is".
Often, by the time the UDPServer realizes that an entity update packet
has not been acknowledged, there is a newer update for the same entity
already queued up or there is a higher priority update that should be
sent first. This patch eliminates 1:1 packet resends for unacked entity
update packets. Insteawd, unacked update packets are decomposed into the
original entity updates and those updates are placed back into the
priority queues based on their new priority but the original update
timestamp. This will generally place them at the head of the line to be
put back on the wire as a new outgoing packet but prevents the resend
queue from filling up with multiple stale updates for the same entity.
This new approach takes advantage of the UDP nature of the Linden protocol
in that the intent of a reliable update packet is that if it goes
unacknowledge, SOMETHING has to happen to get the update to the client.
We are simply making sure that we are resending current object state
rather than stale object state.

Additionally, this patch includes a generalized callback mechanism so
that any caller can specify their own method to call when a packet
expires without being acknowledged. We use this mechanism to requeue
update packets and otherwise use the UDPServer default method of just
putting expired packets in the resend queue.
2011-04-18 16:48:49 -07:00
Huaiyu (Kitty) Liu 28f401d95a Added RegionSyncModule.ProcessAndEnqueuePrimUpdatesBySync, and revised functions relavant
to processing and forwarding prim updates. Code good for 2 CM and PSA to sync on NewObject
and UpdatedPrimProperties.
2011-04-18 15:54:24 -07:00
Justin Clark-Casey (justincc) 36c4e94ef7 Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
2011-04-18 23:22:04 +01:00
Justin Clark-Casey (justincc) f5a041d012 bump default IAR version to 0.2 and 1.1 for the --profile version.
There are no changes in this bump, they just signal a point at which the control file comes first in the archive.
2011-04-18 23:00:41 +01:00
Justin Clark-Casey (justincc) 6109605038 bump oar version number to 0.6.
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
2011-04-18 22:42:36 +01:00
Justin Clark-Casey (justincc) 6600aa2baf Add regression test to check that OARs start with the control file. 2011-04-18 22:35:33 +01:00
Justin Clark-Casey (justincc) e00e518692 add test to ensure that an IAR starts with the control file 2011-04-18 22:24:42 +01:00
Justin Clark-Casey (justincc) 61619ddefc refactor: split out the code which actually copies a particular bundle to inventory 2011-04-18 21:59:01 +01:00
Justin Clark-Casey (justincc) 71114d4ad1 refactor: rename DeleteToInventory() to CopyToInventory()
DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
2011-04-18 21:34:26 +01:00
Justin Clark-Casey (justincc) 5a404a9ab1 Fix bug where objects were being coalesced in the wrong positions.
This addresses http://opensimulator.org/mantis/view.php?id=5441
The bug was due to a pre-existing mistake in creating the inventory stored position
2011-04-18 21:07:11 +01:00
Justin Clark-Casey (justincc) 8533c63d89 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-18 20:36:26 +01:00
Justin Clark-Casey (justincc) 419fc9427e Provide a configuration setting to control whether multiple taken objects are coalesced to inventory
This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true.
2011-04-18 20:03:53 +01:00
Mic Bowman 452ae375f0 Merge branch 'master' into test-merge0418 2011-04-18 11:29:43 -07:00
Melanie 03e725ad87 Mantis #5442: Add admin_save_heightmap 2011-04-17 21:43:16 +01:00
Dan Lake 70084c5e3a More descriptive debug msg for ServiceOSDRequest failures. 2011-04-16 15:29:28 -07:00
Huaiyu (Kitty) Liu 8b08e4b176 Added sync message type UpdatedPrimProperties, to send prim property updates.
Sender/receiver functions most in place, need more testing.
2011-04-15 17:13:56 -07:00
Mic Bowman 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
Diva Canto 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 1dba671f45 refactor: separate out code that adds permissions 2011-04-15 23:32:46 +01:00
BlueWall 065d3f42c7 Merge branch 'master' of /home/opensim/lib/develop/BlueWall 2011-04-15 18:28:46 -04:00
BlueWall 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
Justin Clark-Casey (justincc) 9c7f14bf36 minor: remove a small amount of code duplication 2011-04-15 23:07:23 +01:00
Huaiyu (Kitty) Liu e84a7157b4 Added SyncDeleteObject to replace calling to SendDeleteObject. 2011-04-15 15:00:02 -07:00
Justin Clark-Casey (justincc) 98c5ed2c79 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-15 22:49:59 +01:00
Justin Clark-Casey (justincc) 52d9230392 refactor: split out some rez code into a separate CreateItemForObject() method 2011-04-15 22:47:47 +01:00
Huaiyu (Kitty) Liu 21c48088d8 Added SyncNewObject() to IRegionSyncModule, to be called when new object is
added to local SceneObject (by local operation, not by receiving sync message).
Code seems good for initial sync when one CM connects to PSA.
2011-04-15 12:15:28 -07:00
Huaiyu (Kitty) Liu 9dfc0e92b8 Changed Enum type SceneObjectPartProperties to SceneObjectPartSyncProperties,
to indicate they are the properties synchronzed by the sync protocol.
Also, added UUID to PrimSyncInfo.
Encode/Decode SOP to/from OSDmap seems working fine now.
2011-04-15 10:42:57 -07:00
BlueWall 37d2b6243b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-14 21:16:30 -04:00
BlueWall 40bf417da7 Add ColladaMesh switch 2011-04-14 21:15:42 -04:00