b9bca893ef
Removed debug message in the token bucket code
2011-04-25 16:13:16 -07:00
13f141a4d5
Fix the totals shown by show throttle
2011-04-25 15:36:59 -07:00
a6c53b1ba2
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-25 23:26:37 +01:00
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
b7eda288bf
Merge branch 'master' into queuetest
2011-04-25 15:12:53 -07:00
77ab7ce084
Fixed the transmission of throttles from root agent to child
...
agents. Child throttles are based on the number of child agents
known to the root and at least 1/4 of the throttle given to
the root.
2011-04-25 15:11:29 -07:00
ef4f1fc4ba
Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent.
2011-04-25 11:00:48 -07:00
2fefb7adee
Merge branch 'master' into queuetest
2011-04-25 10:55:19 -07:00
024c12abc3
Cleaned up various configuration options. Removed the category throttle
...
limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.
Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation).
2011-04-25 10:44:41 -07:00
3a38bd8854
Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.
2011-04-25 08:53:48 -07:00
1d7c83c39f
Merge branch 'master' into queuetest
2011-04-25 08:41:21 -07:00
0d5a80ad78
Removed unused libraries: RAILS.dll and dependencies.
2011-04-24 19:14:39 -07:00
35c09cae8c
Removed unused libraries Castle.*
2011-04-24 19:06:48 -07:00
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
e3c3d626fb
Commented verbose debug message.
2011-04-24 16:14:24 -07:00
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
440d54a521
AutoBackup: Removed unneeded imports.
2011-04-23 18:32:08 -04:00
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
e2c6ed236d
Fix a bug looping through the priority queues. This should fix the problem
...
of not all prims being sent without reprioritization.
2011-04-23 12:17:10 -07:00
44e43d9d24
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
2011-04-23 00:40:08 +01:00
d5256094d9
print invalid command message to the console, not the log
2011-04-23 00:16:55 +01:00
a3bd769cb3
Added a second immediate queue to be used for the BestAvatar policy
...
and currently used for all of an avatars attachments by the other
policies. Also changed the way items are pulled from the update queues
to bias close objects even more.
2011-04-22 14:55:23 -07:00
08e58e7ca6
Set the initial rate for the adaptive throttle to 160Kpbs
...
or about 15 packets per second.
2011-04-22 14:02:34 -07:00
3534f4492a
Various clean ups. Removed some debugging code. Added a new "show pqueues"
...
command to look at the entity update priority queue. Added a "name" parameter
to show queues, show pqueues and show throttles to look at data for a specific
user.
2011-04-22 14:01:12 -07:00
c411ab54ee
Merge branch 'master' into careminster-presence-refactor
2011-04-22 08:55:12 +01:00
cbe49ed917
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-04-21 19:08:31 -04:00
b8e282324e
fix merge conflicts with OpenSimDefaults.ini
2011-04-21 19:06:54 -04:00
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
0897647709
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
2011-04-21 15:41:15 -07:00
c5159ad8d0
Add some locking on the child list for the token bucket
...
hiearchy. A few other cosmetic changes.
2011-04-21 15:40:38 -07:00
7f28dd4b31
Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and Removes in that order.
2011-04-21 15:40:32 -07:00
0c68fbdb1a
Merge branch 'master' into careminster-presence-refactor
2011-04-21 23:06:01 +01:00
398bb2149a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-04-21 23:04:01 +01:00
13d6e05d5a
Implement agent limits
2011-04-21 23:03:38 +01:00
a1dce960d7
Add fix a minor bug
2011-04-21 22:45:46 +02:00
282e116f94
Honor agent limit for region crossings and teleports
2011-04-21 22:34:49 +02:00
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
223c90c751
Remove duplicated freeswitch settings.
2011-04-21 19:31:37 +01:00
60685c3517
Adjust freeswitch logging to be somewhat less noisy. However, there is still quite a large amount of logging present for debug purposes.
2011-04-21 19:17:38 +01:00
e36cab99fd
minor: small amount of method doc and some commented out odds and ends
2011-04-21 18:45:05 +01:00
44999dce76
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 18:44:04 +01:00
63c1b7e475
Alter uuid gather so that it properly analyzes coalesced objects.
...
This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
2011-04-21 18:12:29 +01:00
204b8b7b7e
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-21 16:51:39 +01:00
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
371576d1dd
Merge branch 'master' into queuetest
2011-04-21 08:23:01 -07:00
3640d0204f
Added ability to remove unacked packet from UnackedPacketCollection without an acknowledgement from the network. This prevents RTT and throttles from being updated as they would when an ACK is actually received. Also fixed stats logging for unacked bytes and resent packets in this case.
2011-04-21 01:51:08 -07:00
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
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
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