Mic Bowman
1505fbb647
Add back the high prioritization for other avatars in the
...
BestAvatarResponsiveness prioritizer.
2011-04-26 08:54:05 -07:00
Sean McNamara
587aa91e36
Merge git://opensimulator.org/git/opensim
2011-04-26 11:45:38 -04:00
Mic Bowman
36fef21e52
Merge branch 'master' into queuetest
2011-04-26 08:42:21 -07:00
Sean McNamara
c82c7e6ed9
Wait for OnOarFileSaved event callback before executing script
...
We want to execute the (optional) user script after I/O is done on the oar.
I wasn't aware that ArchiveRegion is asynchronous -- now I am.
Should fully resolve comment 0018290 at
http://opensimulator.org/mantis/view.php?id=5440
2011-04-26 11:42:06 -04:00
Diva Canto
e579a990b4
Removed stale client components: MXP and VWoHTTP.
2011-04-25 18:59:01 -07:00
dahlia
037373b825
recover from unhandled exception from bad rotation data while processing entity updates in LLClientView.cs
2011-04-25 17:11:54 -07:00
Mic Bowman
b9bca893ef
Removed debug message in the token bucket code
2011-04-25 16:13:16 -07:00
Mic Bowman
13f141a4d5
Fix the totals shown by show throttle
2011-04-25 15:36:59 -07:00
Mic Bowman
b7eda288bf
Merge branch 'master' into queuetest
2011-04-25 15:12:53 -07:00
Mic Bowman
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
Diva Canto
ef4f1fc4ba
Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent.
2011-04-25 11:00:48 -07:00
Mic Bowman
2fefb7adee
Merge branch 'master' into queuetest
2011-04-25 10:55:19 -07:00
Mic Bowman
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
Diva Canto
3a38bd8854
Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.
2011-04-25 08:53:48 -07:00
Mic Bowman
1d7c83c39f
Merge branch 'master' into queuetest
2011-04-25 08:41:21 -07:00
Diva Canto
0d5a80ad78
Removed unused libraries: RAILS.dll and dependencies.
2011-04-24 19:14:39 -07:00
Diva Canto
35c09cae8c
Removed unused libraries Castle.*
2011-04-24 19:06:48 -07:00
Diva Canto
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
Diva Canto
e3c3d626fb
Commented verbose debug message.
2011-04-24 16:14:24 -07:00
Sean McNamara
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
Sean McNamara
440d54a521
AutoBackup: Removed unneeded imports.
2011-04-23 18:32:08 -04:00
Sean McNamara
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
Mic Bowman
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
Huaiyu (Kitty) Liu
cb6630aa35
For functions in PrimSyncInfo that access per property sync info, adding checking
...
of if m_propertiesSyncInfo[property] exists before accessing it.
2011-04-22 16:57:22 -07:00
E. Allen Soard
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
Justin Clark-Casey (justincc)
d5256094d9
print invalid command message to the console, not the log
2011-04-23 00:16:55 +01:00
Mic Bowman
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
Mic Bowman
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
Mic Bowman
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
Huaiyu (Kitty) Liu
3076761d77
For group properties, only trigger SendPrimPropertyUpdates for the rootpart,
...
to avoid multiple updates (each through a different part in the SOG) to
update the same property.
Also, change m_log in PrimSyncInfo and PropertySyncInfo to a class static
variable, to reduce initiation cost.
2011-04-22 10:39:36 -07:00
Huaiyu (Kitty) Liu
68375822cd
Fixed code so that when GroupPosition or Position is synced between PrimSyncInfoManager
...
and SOP, the other will be udpated properly as well.
Also, in SOP.aggregateScriptEvents, add AggregateScriptEvents as one property that has changed.
2011-04-21 17:44:07 -07:00
BlueWall
cbe49ed917
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-04-21 19:08:31 -04:00
BlueWall
b8e282324e
fix merge conflicts with OpenSimDefaults.ini
2011-04-21 19:06:54 -04:00
BlueWall
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
Mic Bowman
0897647709
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
2011-04-21 15:41:15 -07:00
Mic Bowman
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
Dan Lake
7f28dd4b31
Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and Removes in that order.
2011-04-21 15:40:32 -07:00
Melanie
398bb2149a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-04-21 23:04:01 +01:00
Melanie
13d6e05d5a
Implement agent limits
2011-04-21 23:03:38 +01:00
BlueWall
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
BlueWall
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
Justin Clark-Casey (justincc)
223c90c751
Remove duplicated freeswitch settings.
2011-04-21 19:31:37 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e36cab99fd
minor: small amount of method doc and some commented out odds and ends
2011-04-21 18:45:05 +01:00
Justin Clark-Casey (justincc)
44999dce76
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 18:44:04 +01:00
Justin Clark-Casey (justincc)
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
Mic Bowman
371576d1dd
Merge branch 'master' into queuetest
2011-04-21 08:23:01 -07:00
Dan Lake
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
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