Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-26 | 10 | -3890/+9 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | | * | | | | | | Removed stale client components: MXP and VWoHTTP. | Diva Canto | 2011-04-25 | 9 | -3889/+0 | |
| | | | | | | | | | ||||||
| | | * | | | | | | recover from unhandled exception from bad rotation data while processing ↵ | dahlia | 2011-04-25 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entity updates in LLClientView.cs | |||||
| | * | | | | | | | Removed debug message in the token bucket code | Mic Bowman | 2011-04-25 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fix the totals shown by show throttle | Mic Bowman | 2011-04-25 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-04-26 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'queuetest' into careminster-presence-refactor | Melanie | 2011-04-25 | 11 | -226/+409 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-25 | 2 | -11/+32 | |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | ||||||
| | * | | | | | | | | Fixed the transmission of throttles from root agent to child | Mic Bowman | 2011-04-25 | 3 | -34/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-25 | 1 | -6/+4 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Cleaned up various configuration options. Removed the category throttle | Mic Bowman | 2011-04-25 | 5 | -110/+60 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). | |||||
| | * | | | | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-25 | 25 | -72/+140 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Fix a bug looping through the priority queues. This should fix the problem | Mic Bowman | 2011-04-23 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of not all prims being sent without reprioritization. | |||||
| | * | | | | | | | | | | Added a second immediate queue to be used for the BestAvatar policy | Mic Bowman | 2011-04-22 | 2 | -21/+112 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | | | | Set the initial rate for the adaptive throttle to 160Kpbs | Mic Bowman | 2011-04-22 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or about 15 packets per second. | |||||
| | * | | | | | | | | | | Various clean ups. Removed some debugging code. Added a new "show pqueues" | Mic Bowman | 2011-04-22 | 4 | -29/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵ | Mic Bowman | 2011-04-21 | 2 | -26/+34 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queuetest | |||||
| | | * | | | | | | | | | | Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, ↵ | Dan Lake | 2011-04-21 | 2 | -26/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Removes in that order. | |||||
| | * | | | | | | | | | | | Add some locking on the child list for the token bucket | Mic Bowman | 2011-04-21 | 1 | -15/+22 | |
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hiearchy. A few other cosmetic changes. | |||||
| | * | | | | | | | | | | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-21 | 10 | -89/+204 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Added ability to remove unacked packet from UnackedPacketCollection without ↵ | Dan Lake | 2011-04-21 | 2 | -2/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | | | | | | | | Set the attachment data on scripted rez to allow toasters to work. | Melanie | 2011-04-30 | 2 | -0/+6 | |
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-04-26 | 16 | -33/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 16 | -33/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Made things consistent between LocalInventoryServiceConnector and ↵ | Diva Canto | 2011-04-25 | 2 | -11/+32 | |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RemoteXInventoryServiceConnector on GetFolderContent. | |||||
| | * | | | | | | | | | Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails. | Diva Canto | 2011-04-25 | 1 | -6/+4 | |
| | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Removed unused libraries: RAILS.dll and dependencies. | Diva Canto | 2011-04-24 | 4 | -10/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Removed unused libraries Castle.* | Diva Canto | 2011-04-24 | 3 | -0/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Upped VERSION_NUMBER in master to 0.7.2. | Diva Canto | 2011-04-24 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Commented verbose debug message. | Diva Canto | 2011-04-24 | 1 | -1/+1 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | Added MaxAgents configuration option to RegionConfig.ini allowing region ↵ | E. Allen Soard | 2011-04-23 | 3 | -1/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hosters to setup regions maintaining more control over system resources. | |||||
| | * | | | | | | | print invalid command message to the console, not the log | Justin Clark-Casey (justincc) | 2011-04-23 | 1 | -3/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Try to repair attachments ion the fly if they are detached and reattached. | Melanie | 2011-04-26 | 1 | -0/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-22 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-04-21 | 2 | -0/+25 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | fix merge conflicts with OpenSimDefaults.ini | BlueWall | 2011-04-21 | 12 | -125/+273 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| * | | | | | | | | some mesh config asthetics | BlueWall | 2011-04-21 | 3 | -3/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 8 | -53/+87 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-04-21 | 8 | -53/+87 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-21 | 13 | -126/+274 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | | * | | | | | | Remove duplicated freeswitch settings. | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -4/+0 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Adjust freeswitch logging to be somewhat less noisy. However, there is ↵ | Justin Clark-Casey (justincc) | 2011-04-21 | 2 | -14/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still quite a large amount of logging present for debug purposes. | |||||
| | | * | | | | | | minor: small amount of method doc and some commented out odds and ends | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -6/+15 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -3/+10 | |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | ||||||
| | | * | | | | | | Alter uuid gather so that it properly analyzes coalesced objects. | Justin Clark-Casey (justincc) | 2011-04-21 | 2 | -22/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | Group collada meshies settings under [Mesh] in OpensimDefaults.ini | BlueWall | 2011-04-21 | 2 | -7/+8 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Implement agent limits | Melanie | 2011-04-21 | 2 | -0/+25 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Add fix a minor bug | Melanie | 2011-04-21 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Honor agent limit for region crossings and teleports | Melanie | 2011-04-21 | 2 | -10/+25 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'queuetest' into careminster-presence-refactor | Melanie | 2011-04-21 | 10 | -103/+337 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | |