Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-12 | 2 | -51/+158 |
|\ | |||||
| * | Reinstated a couple of null checks related to the previous revert. | Diva Canto | 2011-02-10 | 1 | -11/+15 |
| | | |||||
| * | Revert "Hunting down mantis #5365" | Diva Canto | 2011-02-10 | 1 | -30/+15 |
| | | | | | | | | This reverts commit ebeef02fef1a04b5b4cfe13dad588bcce7f9ba21. | ||||
| * | Put the Ack of UseCircuitCode back to where it used to be. Some ppl are ↵ | Diva Canto | 2011-02-09 | 1 | -6/+5 |
| | | | | | | | | reporting login issues. | ||||
| * | Comment instrumentation out. Not needed anymore. Left in comments, in case ↵ | Diva Canto | 2011-02-09 | 1 | -4/+7 |
| | | | | | | | | it is needed again. Mantis #5365 | ||||
| * | Fix the negative number problem in TokenBucket. mantis #5365 | Diva Canto | 2011-02-09 | 1 | -5/+4 |
| | | |||||
| * | Revert "Brute-force debug -- mantis #5365" | Diva Canto | 2011-02-09 | 2 | -20/+3 |
| | | | | | | | | This reverts commit 585473aade100c3ffeef27e0c8e6b6c8c09d0109. | ||||
| * | Revert "Don't build strings unless we're in emergency debugging." | Diva Canto | 2011-02-09 | 1 | -8/+8 |
| | | | | | | | | This reverts commit ba202ea9b08b1205de343c65fd209b6cca4cb6bc. | ||||
| * | More detection of negatives. | Diva Canto | 2011-02-09 | 1 | -0/+3 |
| | | |||||
| * | Detect negative dripAmounts in TokenBuckets. These negatives result from ↵ | Diva Canto | 2011-02-09 | 1 | -0/+3 |
| | | | | | | | | overflown integer operations. Also added Total to the scene throttles in show throttles. | ||||
| * | Don't build strings unless we're in emergency debugging. | Diva Canto | 2011-02-08 | 1 | -8/+8 |
| | | |||||
| * | Brute-force debug -- mantis #5365 | Diva Canto | 2011-02-08 | 2 | -3/+20 |
| | | |||||
| * | Avoid potential race conditions on UseCircuitCode. I artificially made the ↵ | Diva Canto | 2011-02-08 | 1 | -23/+28 |
| | | | | | | | | race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back. | ||||
| * | Minor addition to the previous commit | Diva Canto | 2011-02-08 | 1 | -3/+12 |
| | | |||||
| * | Minor improvement to previous commit. | Diva Canto | 2011-02-08 | 1 | -2/+4 |
| | | |||||
| * | Added emergency monitoring of UDP Outgoing packets thread. Just type ↵ | Diva Canto | 2011-02-08 | 1 | -0/+100 |
| | | | | | | | | "emergency-monitoring on/off" | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -15/+30 |
|\ \ | |/ | |||||
| * | Hunting down mantis #5365 | Diva Canto | 2011-02-07 | 1 | -15/+30 |
| | | | | | | | | | | | | Revert "refactor: remove redundant null checks" This reverts commit 6e58996b4d9db202cd7795a37bd687362effef48. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 2 | -7/+14 |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| * | Record number of resent packets in LindenUDP stack and display in stats report | Justin Clark-Casey (justincc) | 2011-02-02 | 2 | -3/+9 |
| | | |||||
| * | Stop double counting dequeued packets for packets sent number | Justin Clark-Casey (justincc) | 2011-02-02 | 1 | -4/+5 |
| | | | | | | | | This is already being incremented in LLUDPServer.SendPacketFinal for every packet | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-28 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Thank you, Goetz, for a patch to fix prim count display in cut regions. | Melanie | 2011-01-28 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 3 | -12/+15 |
|\ \ | |/ | |||||
| * | implement "show throttles" command for showing current agent throttles and ↵ | Justin Clark-Casey (justincc) | 2011-01-21 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | | | the server settings. This is in a very crude state, currently. The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved). This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC | ||||
| * | Correct "show queues" to show queued packet numbers for each client instead ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -9/+9 |
| | | | | | | | | | | | | of bytes. Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content. But raw packet numbers are. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 3 | -38/+24 |
|\ \ | |/ | |||||
| * | force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ↵ | dahlia | 2011-01-17 | 1 | -1/+4 |
| | | | | | | | | packet | ||||
| * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 1 | -3/+3 |
| | | | | | | | | Didn't touch the appearance related stuff. | ||||
| * | refactor: remove redundant null checks | Justin Clark-Casey (justincc) | 2011-01-17 | 1 | -30/+15 |
| | | |||||
| * | Fix UnackedBytes client stack statistic as seen in "show queues" | Justin Clark-Casey (justincc) | 2011-01-17 | 2 | -3/+3 |
| | | | | | | | | Bytes were being wrongly added again on a resend | ||||
| * | objectId in AvatarAnimation packet should be UUID.Zero for non-overridden ↵ | dahlia | 2011-01-17 | 1 | -2/+0 |
| | | | | | | | | animations | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Commented a verbose Debug message in LLUDPServer that got uncommented at ↵ | Diva Canto | 2011-01-05 | 1 | -1/+1 |
| | | | | | | | | some point. | ||||
| * | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+54 |
| | | |||||
* | | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+54 |
| | | |||||
* | | Change the mute list parts of the client interface so that all data is provided | Melanie | 2010-12-24 | 1 | -3/+2 |
| | | | | | | | | to the module | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -24/+16 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-23 | 1 | -6/+12 |
| |\ | |||||
| * | | Removed unused code -- this was the previous version of UDP texture sending, ↵ | Diva Canto | 2010-12-23 | 1 | -24/+16 |
| | | | | | | | | | | | | which now lives entirely in LindenUDP space. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -4/+9 |
|\ \ \ | | |/ | |/| | |||||
| * | | * Re-Adding Scene TimeDilation to Object Update Packets. | Teravus Ovares (Dan Olivares) | 2010-12-23 | 1 | -6/+12 |
| |/ | | | | | | | | | | | * Added Calculating Time Dilation in the OdePlubin * When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise. * Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 1 | -0/+7 |
| | | | | | | | | | | | | * Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-17 | 1 | -5/+8 |
|\ \ | |/ | |||||
| * | minor: 'debug packet' console command level <= 50 then don't log ↵ | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -5/+8 |
| | | | | | | | | ImprovedTerseObjectUpdate messages | ||||
* | | Add locks on m_killRecord without breaking things like justin did | Melanie | 2010-12-16 | 1 | -15/+21 |
| | | |||||
* | | Revert the locking changes in LLCLientView | Melanie | 2010-12-16 | 1 | -233/+224 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-15 | 1 | -224/+233 |
|\ \ | |/ | |||||
| * | Put in locks on m_killRecord to replace changed locks on ↵ | Justin Clark-Casey (justincc) | 2010-12-15 | 1 | -193/+200 |
| | | | | | | | | | | | | | | m_entityUpdates.SyncRoot These locks are necessary to avoid a delete/update race condition for scene objects. However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization |