aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-014-1/+288
|\
| * (re)implement selected prim count.Justin Clark-Casey (justincc)2011-03-301-0/+5
| * move total parcel prim calculations into IPrimCounts instead of doing this in...Justin Clark-Casey (justincc)2011-03-261-0/+24
| * Merge branch 'master' into primcountsJustin Clark-Casey (justincc)2011-03-262-6/+22
| |\
| * | Add test for PCM taint. This currently fails due to unexpected behaviour of ...Justin Clark-Casey (justincc)2011-03-261-0/+112
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData coun...Justin Clark-Casey (justincc)2011-03-253-1/+147
* | | Make the login service's call to the sim time out quicker so we have aMelanie2011-03-311-4/+9
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-271-4/+20
|\ \ \ | | |/ | |/|
| * | minor: make it clearer in the log where we're loading region config files and...Justin Clark-Casey (justincc)2011-03-251-2/+2
| * | in region web loader, print out url that config is being loaded from (this wa...Justin Clark-Casey (justincc)2011-03-251-2/+2
| * | Log the xml/ini regions config files that opensim loads from, and the regions...Justin Clark-Casey (justincc)2011-03-251-4/+20
| |/
* | Add some more fields to Estate settings and make them work.Melanie2011-03-221-0/+24
* | Adding a helper function lifted from Aurora. Not for core.Melanie2011-03-221-0/+9
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-212-2/+2
|\ \ | |/
| * Thanks Kevin Cozens for a patch that:BlueWall2011-03-172-2/+2
| * minor: bring comment into line with code realityJustin Clark-Casey (justincc)2011-03-161-1/+1
| * Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* | Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-106-8/+19
|\ \ | |/
| * Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-094-6/+0
| * Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make sta...Justin Clark-Casey (justincc)2011-03-091-1/+18
| * Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to ...Justin Clark-Casey (justincc)2011-03-051-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-241-3/+10
|\ \ | |/
| * Parameterizes the view distance used to compute and manageMic Bowman2011-02-221-3/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-192-2/+13
|\ \ | |/
| * Put some CapabilitiesModule null checks in SceneJustin Clark-Casey (justincc)2011-02-181-1/+0
| * XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386Diva Canto2011-02-161-1/+13
* | Add needed dummy to sample moneyMelanie2011-02-171-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-161-13/+7
|\ \ | |/
| * Fix and simplify QBasedComparer.Marck2011-02-131-13/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-073-2/+62
|\ \ | |/
| * Fixed Caps handlers leakDiva Canto2011-02-051-1/+1
| * Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-0/+32
| * Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still su...Diva Canto2011-02-051-1/+29
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-073-13/+26
|\ \ | |/
| * Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage...Justin Clark-Casey (justincc)2011-02-041-0/+10
| * Fix "set log level" to once again display current log level if it's not given...Justin Clark-Casey (justincc)2011-02-041-12/+15
| * Addresses mantis #5360: CreatorData was being written as long as it wasn't nu...Diva Canto2011-02-031-1/+1
* | Change the timeout on WebUtil to 20s to help make more tps succeedMelanie2011-02-021-4/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-281-0/+2
|\ \ | |/
| * Thank you, Goetz, for a patch to fix prim count display in cut regions.Melanie2011-01-281-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-272-6/+19
|\ \ | |/
| * Implement command "land show". This shows all the parcels on the currently s...Justin Clark-Casey (justincc)2011-01-261-1/+1
| * Removed a few more spurious appearance saves. When an avatarMic Bowman2011-01-251-5/+18
* | Add userFlags check to isBanned. This checks bans against DenyAnonymous and D...Tom2011-01-262-5/+24
* | Revert my previous SHA1 commit in favour of a better implementationTom2011-01-261-3/+9
* | Provide an SL compatible llMD5String function across all platformsTom2011-01-261-4/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-235-13/+43
|\ \ | |/
| * Update the "config get <section> <key>" command to "config get [<section>] [<...Justin Clark-Casey (justincc)2011-01-212-0/+19
| * make "show info" and "show version" show the same version textJustin Clark-Casey (justincc)2011-01-211-4/+7