aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | | | types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both.
| * | First pass at moving object property requests into a queue similarMic Bowman2011-04-131-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code.
* | | 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 ↵Diva Canto2011-04-124-445/+335
| | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
* | 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 ↵Justin Clark-Casey (justincc)2011-04-061-1/+1
| | | | | | | | branch now exists.
| * Improve previous ILandObject method doc.Justin Clark-Casey (justincc)2011-04-061-2/+6
| | | | | | | | For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
| * Add method doc to some land bitmap methods in ILandObject.Justin Clark-Casey (justincc)2011-04-061-0/+18
| | | | | | | | Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-064-73/+5
|\ \ | |/
| * Change some text to make the autoreturn mechanism more obvious, and align ↵Justin Clark-Casey (justincc)2011-04-051-1/+1
| | | | | | | | with the fact that it's one word rather than two.
| * remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-054-72/+4
| | | | | | | | | | However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc. This is probably why prim counts were being done there in the first place.
| * Remove unused RegionInfo.getInternalEndPointPort() in favour of ↵Justin Clark-Casey (justincc)2011-03-311-6/+1
| | | | | | | | RegionInfo.InternalEndPoint.Port
| * 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
| | | | | | | | This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
| * move total parcel prim calculations into IPrimCounts instead of doing this ↵Justin Clark-Casey (justincc)2011-03-261-0/+24
| | | | | | | | | | | | in LLClientView need to move selected prim counts from LandData/LMM still
| * 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
| | | | | | | | | | | | | | | | | | SceneGraph.ForEachSOG(). This will be corrected soon. Also adds lots of temproarily debug logging
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵Justin Clark-Casey (justincc)2011-03-253-1/+147
| | | | | | | | | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly.
* | | Make the login service's call to the sim time out quicker so we have aMelanie2011-03-311-4/+9
| | | | | | | | | | | | chance to try fallback before the client quits
* | | 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 ↵Justin Clark-Casey (justincc)2011-03-251-2/+2
| | | | | | | | | | | | and not the regions themselves
| * | in region web loader, print out url that config is being loaded from (this ↵Justin Clark-Casey (justincc)2011-03-251-2/+2
| | | | | | | | | | | | wasn't being done anywhere).
| * | Log the xml/ini regions config files that opensim loads from, and the ↵Justin Clark-Casey (justincc)2011-03-251-4/+20
| |/ | | | | | | | | | | regions that it loaded from them This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
* | Add some more fields to Estate settings and make them work.Melanie2011-03-221-0/+24
| | | | | | | | | | Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1; to make this work.
* | 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
| | | | | | | | Fixes several spelling mistakes
| * 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
| | | | | | | | | | request method and target are reported correctly and drop the txn id as it's empty 99% of the time.
* | Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
| | | | | | | | | | request method and target are reported correctly and drop the txn id as it's empty 99% of the time.
* | 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
| | | | | | | | This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
| * Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make ↵Justin Clark-Casey (justincc)2011-03-091-1/+18
| | | | | | | | static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
| * Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to ↵Justin Clark-Casey (justincc)2011-03-051-1/+1
| | | | | | | | | | | | false Implement test for ClearMediaEntry()
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | child agents in neighbor regions. This means you can extend the view on a simulator beyond the default 3x3 regions. This uses a region default draw distance and should be replaced at some point by the avatar specified draw distance. That will require more careful, dynamic recomputation of child agents every time the draw distance changes. WARNING: this is experimental and has known instabilities. specifically all regions "within site" should be running the same default draw distance or agents will not be closed correctly.
* | 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
| | | | | | | | Stop tests setting up a capabilities module by default
| * 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
| | | | | | | | Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-073-2/+62
|\ \ | |/
| * Fixed Caps handlers leakDiva Canto2011-02-051-1/+1
| |
generated by cgit v1.1 at 2024-11-17 03:20:12 +0000