aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-05-087-355/+44
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-05-087-355/+44
| |\
| | * Removed SimpleRegionInfo, which was obsolete and not used anywhere.Diva Canto2011-05-061-245/+0
| | * refactor: simplify ConfigSettingsJustin Clark-Casey (justincc)2011-05-061-59/+7
| | * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-05-062-2/+2
| | * remove obsolete [StandAlone] config section parsing, none of which was actual...Justin Clark-Casey (justincc)2011-05-061-49/+1
| | * Adding ssl supportBlueWall2011-05-053-0/+34
| * | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-8/+35
| |/
* | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-8/+35
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-0528-3491/+1
|\ \ | |/
| * Merge branch 'master' into capsDiva Canto2011-05-021-9/+9
| |\
| * \ Merge branch 'master' into capsDiva Canto2011-05-012-7/+7
| |\ \
| * | | Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dllDiva Canto2011-04-3028-3491/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-032-14/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Turns out that it's a bad idea to let Agent position updates linger for a lon...Diva Canto2011-05-021-9/+9
| | |/ | |/|
| * | Increased Timeout to 30 secs.Diva Canto2011-04-301-3/+3
| * | Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because i...Diva Canto2011-04-302-13/+3
| * | XXX DEBUGGING!Diva Canto2011-04-302-2/+12
| |/
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-04-305-97/+139
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-304-77/+54
| |\ \ | | |/
| | * Fatpack message on agent transfers: 1 message only (UpdateAgent) containing t...Diva Canto2011-04-282-6/+53
| | * One less [Serializable] -- ClientInfo.Diva Canto2011-04-281-1/+0
| | * Eliminated sAgentCircuitData, a data structure that has been obsolete for qui...Diva Canto2011-04-282-70/+1
| * | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-251-20/+85
| |\ \ | | |/
| | * Merge branch 'master' into queuetestMic Bowman2011-04-253-4/+19
| | |\
| | * | 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-221-17/+82
| | * | Various clean ups. Removed some debugging code. Added a new "show pqueues"Mic Bowman2011-04-221-4/+3
| | * | Merge branch 'master' into queuetestMic Bowman2011-04-211-1/+1
| | |\ \
* | | | | Set the attachment data on scripted rez to allow toasters to work.Melanie2011-04-301-0/+3
|/ / / /
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-253-4/+19
|\ \ \ \ | | |_|/ | |/| |
| * | | Upped VERSION_NUMBER in master to 0.7.2.Diva Canto2011-04-241-1/+1
| * | | Added MaxAgents configuration option to RegionConfig.ini allowing region host...E. Allen Soard2011-04-231-0/+17
| * | | print invalid command message to the console, not the logJustin Clark-Casey (justincc)2011-04-231-3/+1
| | |/ | |/|
* | | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-213-12/+322
|\ \ \ | | |/ | |/|
| * | Added an "immediate" queue to the priority queue. This isMic Bowman2011-04-201-0/+258
| * | Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-192-12/+64
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-211-1/+1
|\ \ \ | | |/ | |/|
| * | Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-201-1/+1
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-181-18/+26
|\ \ | |/
| * Merge branch 'master' into test-merge0418Mic Bowman2011-04-181-2/+2
| |\
| * | Fixed the update of items in the priority queue to enable bothMic Bowman2011-04-131-0/+5
| * | First pass at moving object property requests into a queue similarMic Bowman2011-04-131-18/+21
* | | Correct the delegate for classified deletesMelanie2011-04-171-1/+2
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-174-462/+344
|\ \ \ | | |/ | |/|
| * | More descriptive debug msg for ServiceOSDRequest failures.Dan Lake2011-04-161-2/+2
| |/
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-124-445/+335
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-081-0/+22
|\ \ | |/
| * Revert master version number to 0.7.1 for now to make merging easier.Justin Clark-Casey (justincc)2011-04-071-1/+1
| * bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch...Justin Clark-Casey (justincc)2011-04-061-1/+1