aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
generated by cgit v1.1 at 2024-11-18 00:42:19 +0000