aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-11-091-2/+2
|\
| * Formatting cleanup.Jeff Ames2010-11-081-2/+2
| |
* | Fix merge artefactsMelanie2010-11-051-4/+4
| |
* | Revert "Spin the AddNewClient process off into a new thread to avoid locking ↵Melanie2010-11-051-24/+1
| | | | | | | | | | | | | | | | | | | | up the LLUDPServer (and therefore the entire scene)" This reverts commit 40e05f41098bdedac7296d84c9aa8d915c5c9ede. Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
* | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵Melanie2010-11-051-37/+5
| | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-9/+25
|\ \ | |/
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-301-0/+1
| | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2.
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-1/+1
| |\
| | * Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-301-1/+1
| | | | | | | | | | | | | | | | | | Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously. Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably. Of course, a lot of login lag is still coming from other sources.
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-2/+8
| |\ \ | | |/
| | * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-291-2/+8
| | |\
| | | * Add number of ms it takes to complete UseCircuitCode packet handling to log ↵Justin Clark-Casey (justincc)2010-10-291-2/+8
| | | | | | | | | | | | | | | | for diagnostics
| * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-6/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-4/+4
|\ \ \ | |/ /
| * | Merge branch 'dev-appearance'Melanie2010-10-291-4/+4
| |\ \ | | |/ | |/|
| | * Major refactoring of appearance handling.Master ScienceSim2010-10-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations.
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-1/+1
| | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-221-1/+1
| |\ \
| | * | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-211-1/+1
| | |/
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-1/+1
|\ \ \ | |/ /
| * | Deleted a verbose and unneeded log message.Diva Canto2010-10-211-1/+1
| |/
| * Fix a comment markerMelanie2010-10-041-1/+1
| |
| * Add linden prim renderer and update libOMVMelanie2010-10-041-16/+31
| |
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-15/+26
| | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | Fix line endingsMelanie2010-10-041-184/+184
| |
* | Add linden prim renderer and update libOMVMelanie2010-10-041-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-0/+4
|\ \ | |/
| * Send kill packets for avatars, tooMelanie2010-09-171-0/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-173-2/+17
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * Send KillPackets on the Task queue rather than the State queueJustin Clark-Casey (justincc)2010-09-173-2/+17
| | | | | | | | | | | | | | | | | | Object updates are sent on the task queue. It's possible for an object update to be placed on the client queue before a kill packet comes along. The kill packet would then be placed on the state queue and possibly get sent before the update If the update gets sent afterwards then client get undeletable no owner objects until relog Placing the kills in the task queue should mean that they are received after updates. The kill record prevents subsequent updates getting on the queue Comments state that updates are sent via the state queue but this isn't true. If this was the case this problem might not exist.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-161-49/+49
|\ \ | |/
| * extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() ↵Justin Clark-Casey (justincc)2010-09-151-49/+49
| | | | | | | | | | | | | | | | | | to reduce scope for kill/update race conditions This is necessary because it was still possible for an entity update packet to be constructed, the thread to pause, a kill to be sent on another thread, and then the original thread to resume and send the update This would result in an update being received after a kill, which results in undeletable ghost objects until the viewer is relogged Extending the lock looks okay since its only taken by kill, update and reprioritize, and both kill and update do not take further locks However, evidence suggests that there is still a kill/update race somewhere
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-142-5/+11
|\ \ | |/
| * Improve generic message exception logging. Quieten down complaints about ↵Justin Clark-Casey (justincc)2010-09-131-2/+4
| | | | | | | | unhandled GenericMessages
| * Add client name to packet resend log messages to make them a bit more ↵Justin Clark-Casey (justincc)2010-09-131-3/+7
| | | | | | | | informative
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-132-154/+136
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * MergedJohn Hurliman2010-09-121-132/+129
| |\
| | * Formatting cleanup.Jeff Ames2010-09-121-132/+129
| | |
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-24/+9
| |/ | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
| * Prevent child agents from being blacklisted in the kill record.Melanie2010-09-111-3/+6
| |
| * Rolling back the recent libomv update but keeping the ExpiringCache cleanups ↵John Hurliman2010-09-072-5/+5
| | | | | | | | (as much as is possible). There was a report of non-finite avatar positions after the update
| * * Cache null account responses in the SimianUserAccountServiceConnector to ↵John Hurliman2010-09-072-5/+5
| | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
| * Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-051-1/+5
| | | | | | | | on IDwellModule
* | Prevent child agents from being blacklisted in the kill record.Melanie2010-09-111-3/+6
| |
* | Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-051-1/+5
| | | | | | | | on IDwellModule
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-18/+41
|\ \ | |/
| * Show when appearance is sent to an avatar to help track down failureMelanie Thielker2010-09-021-0/+1
| | | | | | | | \to display avatars
| * reinsert functionality to debug log more levels of incoming and outgoing ↵Justin Clark-Casey (justincc)2010-08-311-9/+43
| | | | | | | | | | | | | | client protocol packets These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets) This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
* | Show when appearance is sent to an avatar to help track down failureMelanie Thielker2010-09-021-0/+1
| | | | | | | | \to display avatars
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-65/+80
|\ \ | |/