Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 1 | -137/+169 |
|\ \ | |/ | |||||
| * | Another stab at #LoginLag. Looking forward to hear the feedback! This makes ↵ | Diva Canto | 2010-12-14 | 1 | -2/+23 |
| | | | | | | | | updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies. | ||||
| * | Relax a highly constraining lock on m_entityUpdates that may be preventing ↵ | Diva Canto | 2010-12-14 | 1 | -126/+127 |
| | | | | | | | | reprioritizations from actually happening. #LoginLag | ||||
| * | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 1 | -3/+7 |
| | | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work. | ||||
| * | It turns out that the 1/2 sec burst for prims download is not a bug, but a ↵ | Diva Canto | 2010-12-13 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | | feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid. Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond." This reverts commit 870bbcfc6c264c515ac660837d16ccad4e59ac64. | ||||
| * | This may have been the biggest, baddest bug in OpenSim ever... confusion ↵ | Diva Canto | 2010-12-13 | 1 | -2/+11 |
| | | | | | | | | between bytes per second and bytes per millisecond. | ||||
| * | Revert "Another stab at mantis #5256" | Diva Canto | 2010-12-10 | 1 | -20/+19 |
| | | | | | | | | This reverts commit ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47. | ||||
| * | Another stab at mantis #5256 | Diva Canto | 2010-12-10 | 1 | -19/+20 |
| | | |||||
| * | Revert "A stab at mantis #5256. Separate ScenePresence updates from ↵ | Diva Canto | 2010-12-10 | 1 | -150/+128 |
| | | | | | | | | | | | | SceneObject updates, and place them in different queues." This reverts commit f84905e2949d61239c8bff815f8061a9435c124c. | ||||
| * | A stab at mantis #5256. Separate ScenePresence updates from SceneObject ↵ | Diva Canto | 2010-12-10 | 1 | -128/+150 |
| | | | | | | | | updates, and place them in different queues. | ||||
* | | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 1 | -3/+7 |
| | | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work. | ||||
* | | Prevent sending of attachment data to any client if the attachment | Melanie | 2010-12-08 | 1 | -0/+21 |
| | | | | | | | | is not actually attached to any avatar. Another stab ad fixing "HUD hair" | ||||
* | | Allow TPing multiple people in the friends list in one go. | Melanie | 2010-12-07 | 1 | -5/+10 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 3 | -19/+50 |
| |\ | |||||
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 2 | -5/+23 |
| |\ \ | |||||
| * \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 2 | -4/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -7/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | ||||
| * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -2/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * \ \ \ \ \ \ | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | | Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims | Melanie | 2010-12-04 | 1 | -15/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some unneccessarily wordy core comments |