aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)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
| | | | | | | | | | | | | | | | of not all prims being sent without reprioritization.
| | * | Added a second immediate queue to be used for the BestAvatar policyMic Bowman2011-04-221-17/+82
| | | | | | | | | | | | | | | | | | | | | | | | and currently used for all of an avatars attachments by the other policies. Also changed the way items are pulled from the update queues to bias close objects even more.
| | * | Various clean ups. Removed some debugging code. Added a new "show pqueues"Mic Bowman2011-04-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | command to look at the entity update priority queue. Added a "name" parameter to show queues, show pqueues and show throttles to look at data for a specific user.
| | * | 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 ↵E. Allen Soard2011-04-231-0/+17
| | | | | | | | | | | | | | | | hosters to setup regions maintaining more control over system resources.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | per Melanie's very good suggestion. The immediate queue is serviced completely before all others, making it a very good place to put avatar updates & attachments. Moved the priority queue out of the LLUDP directory and into the framework. It is now a fairly general utility.
| * | Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-192-12/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often, by the time the UDPServer realizes that an entity update packet has not been acknowledged, there is a newer update for the same entity already queued up or there is a higher priority update that should be sent first. This patch eliminates 1:1 packet resends for unacked entity update packets. Insteawd, unacked update packets are decomposed into the original entity updates and those updates are placed back into the priority queues based on their new priority but the original update timestamp. This will generally place them at the head of the line to be put back on the wire as a new outgoing packet but prevents the resend queue from filling up with multiple stale updates for the same entity. This new approach takes advantage of the UDP nature of the Linden protocol in that the intent of a reliable update packet is that if it goes unacknowledge, SOMETHING has to happen to get the update to the client. We are simply making sure that we are resending current object state rather than stale object state. Additionally, this patch includes a generalized callback mechanism so that any caller can specify their own method to call when a packet expires without being acknowledged. We use this mechanism to requeue update packets and otherwise use the UDPServer default method of just putting expired packets in the resend queue.
* | | 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
| |/ | | | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is.
* | 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
| |