aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| * Improve previous ILandObject method doc.Justin Clark-Casey (justincc)2011-04-061-2/+6
| * Add method doc to some land bitmap methods in ILandObject.Justin Clark-Casey (justincc)2011-04-061-0/+18
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-064-73/+5
|\ \ | |/
| * Change some text to make the autoreturn mechanism more obvious, and align wit...Justin Clark-Casey (justincc)2011-04-051-1/+1
| * remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-054-72/+4
| * Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.In...Justin Clark-Casey (justincc)2011-03-311-6/+1
| * Remove unused Datastore parameter from RegionInfo (legacy from early 2008)Justin Clark-Casey (justincc)2011-03-311-11/+0
* | 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