aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-06-095-2/+87
|\
| * HG Landmarks now working.Diva Canto2011-06-032-1/+4
| * Fill in the new OwnerData field in the LLUDP ScriptDialog message.Justin Clark-Casey (justincc)2011-05-311-1/+13
| * More on HG Friends. Added Delete(string, string) across the board. Added secu...Diva Canto2011-05-221-2/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-211-1/+0
| |\
| * | HG Friends working to some extent: friendships offered and accepted correctly...Diva Canto2011-05-193-0/+68
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom2011-05-262-5/+4
|\ \ \
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-05-221-1/+0
| |\ \ \ | | | |/ | | |/|
| | * | Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Te...Justin Clark-Casey (justincc)2011-05-211-1/+0
| | |/
| * | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-201-4/+4
| |\ \ | | |/
| | * Changed yet more Warns to Debugs.Diva Canto2011-05-141-4/+4
* | | Some additional protection, it seems that responsedata needs to be locked, bu...Tom2011-05-261-5/+14
|/ /
* | If a response cannot be obtained (the script has no handler) return a more fr...Tom2011-05-171-4/+18
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-142-5/+8
|\ \ | |/
| * Also changed a couple of messages in WebUtil from Wanr/Info to Debug.Diva Canto2011-05-141-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-141-2/+2
| |\
| | * refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() inst...Justin Clark-Casey (justincc)2011-05-141-2/+2
| * | Stop spamming Nebadon's console when assets aren't found in the asset server.Diva Canto2011-05-141-1/+4
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-131-9/+23
|\ \ | |/
| * Hopefully this fixes offline messages. The problem was: the server is not set...Diva Canto2011-05-121-7/+2
| * One more thing printed out. #OfflineIMDiva Canto2011-05-121-4/+1
| * Instrument the heck out of offline messages. THIS IS VERY VERBOSE.Diva Canto2011-05-121-0/+16
| * One more debug message for offline IMs.Diva Canto2011-05-121-1/+2
| * Sequencing the using and try clauses as they were before, but this shows that...Diva Canto2011-05-121-7/+7
| * Bummer, can't print the data I wanted to see. Printing just the context.Diva Canto2011-05-121-9/+1
| * Tracking a problem with offline IMs coming in as null list.Diva Canto2011-05-121-6/+19
| * This makes compression of fatpacks actually work. Previously they always fail...Diva Canto2011-05-111-7/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-091-1/+1
|\ \ | |/
| * The map is seriously broken. This doesn't fix it, but at least provides one m...Diva Canto2011-05-081-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-091-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-081-0/+5
| |\
| | * Also compress the actual fatpacksMelanie2011-05-081-0/+5
| * | Fix content-type to be application/x-www-form-urlencodedDiva Canto2011-05-081-1/+1
| |/
* | Also compress the actual fatpacksMelanie2011-05-081-0/+5
* | 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