aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2011-04-261-0/+4
|\
| * Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-04-2616-33/+61
| |\
| * | Try to repair attachments ion the fly if they are detached and reattached.Melanie2011-04-261-0/+4
* | | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-2511-226/+409
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into queuetestMic Bowman2011-04-252-11/+32
| |\ \
| * | | Fixed the transmission of throttles from root agent to childMic Bowman2011-04-253-34/+41
| * | | Merge branch 'master' into queuetestMic Bowman2011-04-251-6/+4
| |\ \ \
| * | | | Cleaned up various configuration options. Removed the category throttleMic Bowman2011-04-255-110/+60
| * | | | Merge branch 'master' into queuetestMic Bowman2011-04-2525-72/+140
| |\ \ \ \
| * | | | | Fix a bug looping through the priority queues. This should fix the problemMic Bowman2011-04-231-2/+3
| * | | | | Added a second immediate queue to be used for the BestAvatar policyMic Bowman2011-04-222-21/+112
| * | | | | Set the initial rate for the adaptive throttle to 160KpbsMic Bowman2011-04-221-4/+6
| * | | | | Various clean ups. Removed some debugging code. Added a new "show pqueues"Mic Bowman2011-04-224-29/+110
| * | | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu...Mic Bowman2011-04-212-26/+34
| |\ \ \ \ \
| | * | | | | Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and...Dan Lake2011-04-212-26/+34
| * | | | | | Add some locking on the child list for the token bucketMic Bowman2011-04-211-15/+22
| |/ / / / /
| * | | | | Merge branch 'master' into queuetestMic Bowman2011-04-2110-89/+204
| |\ \ \ \ \
| * | | | | | Added ability to remove unacked packet from UnackedPacketCollection without a...Dan Lake2011-04-212-2/+38
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-2516-33/+61
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Made things consistent between LocalInventoryServiceConnector and RemoteXInve...Diva Canto2011-04-252-11/+32
| | |_|_|/ | |/| | |
| * | | | Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.Diva Canto2011-04-251-6/+4
| | |_|/ | |/| |
| * | | Removed unused libraries: RAILS.dll and dependencies.Diva Canto2011-04-244-10/+0
| * | | Removed unused libraries Castle.*Diva Canto2011-04-243-0/+0
| * | | Upped VERSION_NUMBER in master to 0.7.2.Diva Canto2011-04-241-1/+1
| * | | Commented verbose debug message.Diva Canto2011-04-241-1/+1
| * | | Added MaxAgents configuration option to RegionConfig.ini allowing region host...E. Allen Soard2011-04-233-1/+22
| * | | print invalid command message to the console, not the logJustin Clark-Casey (justincc)2011-04-231-3/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-223-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-04-212-0/+25
| |\ \ \
| * \ \ \ fix merge conflicts with OpenSimDefaults.iniBlueWall2011-04-2112-125/+273
| |\ \ \ \
| * | | | | some mesh config astheticsBlueWall2011-04-213-3/+3
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-218-53/+87
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-04-218-53/+87
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-2113-126/+274
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove duplicated freeswitch settings.Justin Clark-Casey (justincc)2011-04-211-4/+0
| | | * | | Adjust freeswitch logging to be somewhat less noisy. However, there is still...Justin Clark-Casey (justincc)2011-04-212-14/+21
| | | * | | minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-211-3/+10
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-212-22/+43
| | * | | | Group collada meshies settings under [Mesh] in OpensimDefaults.iniBlueWall2011-04-212-7/+8
| * | | | | Implement agent limitsMelanie2011-04-212-0/+25
| | |_|/ / | |/| | |
* | | | | Add fix a minor bugMelanie2011-04-211-1/+1
* | | | | Honor agent limit for region crossings and teleportsMelanie2011-04-212-10/+25
* | | | | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-2110-103/+337
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | bug fix. Now when an unacked update packet is handled through ResendPrimUpdat...Dan Lake2011-04-203-16/+25
| * | | | Added an "immediate" queue to the priority queue. This isMic Bowman2011-04-202-17/+30
| * | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu...Mic Bowman2011-04-200-0/+0
| |\ \ \ \
| | * | | | Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-185-66/+176
| * | | | | Adds the first pass at an adaptive throttle to slow start newMic Bowman2011-04-204-18/+95
| * | | | | Converted the property request queue to use the same retransmissionMic Bowman2011-04-191-23/+52