Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 1 | -1/+2 |
|\ | |||||
| * | Note to self: try to make only 3 things at the same time. | Diva Canto | 2011-01-04 | 1 | -1/+1 |
| | | |||||
| * | Guard against null Animator. | Diva Canto | 2011-01-04 | 1 | -1/+2 |
| | | |||||
* | | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵ | Kitto Flora | 2011-01-04 | 1 | -2/+2 |
| | | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Put the coarse location updates back to 50 frames, otherwise the dots on the ↵ | Diva Canto | 2010-12-19 | 1 | -2/+2 |
| | | | | | | | | mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-15 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Yet more things out of the main Update thread loop and into threadlets. This ↵ | Diva Canto | 2010-12-14 | 1 | -1/+4 |
| | | | | | | | | time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag. | ||||
| * | Commented out the UpdateLand call from the Update thread loop, because this ↵ | Diva Canto | 2010-12-14 | 1 | -0/+1 |
| | | | | | | | | may be causing the #LoginLag. Attachments taint the prim count. Twice. Each. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 1 | -2/+4 |
|\ \ | |/ | | | | | | | Also fix the failure to fire CHANGED_LINK on sit, which is different in our code. | ||||
| * | Null checking ParentGroup is not needed. It can't be null. | Melanie | 2010-12-14 | 1 | -4/+2 |
| | | |||||
| * | This seems to get rid of the stuck PREJUMP animation, as reported by Justin ↵ | Diva Canto | 2010-12-13 | 1 | -2/+5 |
| | | | | | | | | in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 1 | -2/+5 |
|\ \ | |/ | |||||
| * | Trigger event with flag CHANGED_LINK when agent sits on objects that have ↵ | Marck | 2010-12-12 | 1 | -2/+6 |
| | | | | | | | | not a sit target defined. This fixes Mantis #4692. | ||||
| * | Fixes the nudge movements! | Diva Canto | 2010-12-11 | 1 | -27/+0 |
| | | |||||
| * | Revert "Another stab at mantis #5256" | Diva Canto | 2010-12-10 | 1 | -12/+6 |
| | | | | | | | | This reverts commit ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47. | ||||
| * | Another stab at mantis #5256 | Diva Canto | 2010-12-10 | 1 | -6/+12 |
| | | |||||
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -1/+1 |
| | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 1 | -115/+160 |
| |\ | |||||
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -0/+23 |
| |\ \ | |||||
| * \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -29/+34 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -11/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -10/+16 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -20/+46 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -118/+51 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
* | | | | | | | | | | Apply the useful part of diva's patch that was skipped | Melanie | 2010-12-12 | 1 | -27/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ↵ | Mic Bowman | 2010-12-03 | 1 | -16/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging. | ||||
* | | | | | | | | | | Various bug fixes for appearance handling | Mic Bowman | 2010-11-30 | 1 | -16/+30 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -21/+24 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Reformat an overzealous comment. Remove end of line marks and reference to the | Melanie | 2010-11-27 | 1 | -21/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mantis solved, as that isn't needed to understand the code. Reformat the comment for 80 col screens. | ||||
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -10/+27 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | llUnsit position fix 4063 (updated 11-20-2010) | Micheil Merlin | 2010-11-27 | 1 | -2/+27 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines ↵ | Mic Bowman | 2010-11-27 | 1 | -114/+117 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes. | ||||
| * | | | | | | | | Prevent leftover attachments from clogging up the pipes | Melanie | 2010-11-16 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+20 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
* | | | | | | | | Prevent an overlength button label from producing a debug dump and aborting | Melanie | 2010-11-24 | 1 | -115/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the script. | ||||
* | | | | | | | | Send parcel data upon becoming root. This will make streams play and build | Melanie | 2010-11-18 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flags be set properly | ||||
* | | | | | | | | Prevent leftover attachments from clogging up the pipes | Melanie | 2010-11-16 | 1 | -1/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-11-16 | 1 | -2/+16 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ \ \ \ \ \ \ | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-11-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | | | | | | | Fix excessive forward motion and flailing while descending a slope, prevent ↵ | Kitto Flora | 2010-11-11 | 1 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding motion while falling from flying. | ||||
* | | | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+18 |
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Formatting cleanup. | Jeff Ames | 2010-11-08 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Fix merge artefacts | Melanie | 2010-11-05 | 1 | -55/+18 |
| | | | | | | | |||||
* | | | | | | | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵ | Melanie | 2010-11-05 | 1 | -26/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-refactor | Melanie | 2010-11-03 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Actually calculate the height before setting it, this isn't done automatically | Melanie | 2010-11-03 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | on incoming transfers in all cases. |