| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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. | ||||
| | * | Trying to prevent a wrong physical actor size | Melanie | 2010-11-03 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -4/+1 |
| |\ \ | |/ | |||||
| | * | Fix avatar height management | Melanie | 2010-11-02 | 1 | -24/+11 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -48/+50 |
| |\ \ | |/ | |||||
| | * | Fix sitting and standing up | Melanie | 2010-11-02 | 1 | -5/+14 |
| | | | |||||
| | * | Move physics actor creation to after SetHeight to try and prevent | Melanie | 2010-10-30 | 1 | -11/+11 |
| | | | | | | | | | bowlegginess. Didn't work but is better this way anyway. | ||||
| | * | tweak a few more scene presence logging messages for consistency | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+3 |
| | | | |||||
| | * | Rationalize the logging messages from the merged appearance branch, ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -5/+5 |
| | | | | | | | | | commenting out most of them as per Mic | ||||
| | * | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+9 |
| | |\ | |||||
| | | * | add timing report to CompleteScenePresence for diagnostic purposes | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -23/+50 |
| |\ \ \ | |/ / | |||||
| | * | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 1 | -23/+50 |
| | |\ \ | |||||
| | | * | | Clean up some cruft from the last commit. Re-add the initial update | Master ScienceSim | 2010-10-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | send in the scene presence constructor... need to figure this out later. | ||||
| | | * | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 1 | -20/+46 |
| | | | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | ||||
| | | * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -123/+48 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -114/+48 |
| | |\ \ \ | | |_|/ | |/| | | |||||
| | | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 1 | -115/+50 |
| | | |\ \ | | | |/ | | | | | | | | | dev-appearance | ||||
| | | | * | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 1 | -114/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Comment repeated add and remove of avatars from the physical scene. It's no | Melanie | 2010-10-25 | 1 | -16/+22 |
| | | | | | | | | | | | | | | | | | longer needed. | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -2/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -0/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 |
| | |/ | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -1/+1 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |