| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 16 | -304/+568 |
| |\ | |||||
| | * | Rename the new default texture to be consistent with the others | Melanie | 2010-10-29 | 2 | -1/+1 |
| | | | |||||
| | * | Add a default alpha layer | Melanie | 2010-10-29 | 1 | -0/+0 |
| | | | |||||
| | * | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 14 | -303/+567 |
| | |\ | |||||
| | | * | Clean up some cruft from the last commit. Re-add the initial update | Master ScienceSim | 2010-10-29 | 2 | -2/+41 |
| | | | | | | | | | | | | | | | | 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 | 5 | -81/+132 |
| | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | ||||
| | | * | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 3 | -5/+41 |
| | | | | |||||
| | | * | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 28 | -130/+273 |
| | | |\ | |||||
| | | * | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 2 | -59/+171 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance. | ||||
| | | * | | Small cleanup and add more debugging information | Master ScienceSim | 2010-10-26 | 2 | -8/+23 |
| | | | | | |||||
| | | * | | Made the check for texture assets asynchronous. This is one part of | Master ScienceSim | 2010-10-26 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | a bigger clean up that needs to happen around locks on appearance. | ||||
| | | * | | Half of the compatibility is working. Login into a new region with | Master ScienceSim | 2010-10-25 | 4 | -21/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | old data works. Teleport out of a new region with old data works. Teleport into a new region with old data does not trigger the necessary rebake. | ||||
| | | * | | Intermediate commit for backward compatability; does not compile yet | Mic Bowman | 2010-10-25 | 2 | -62/+73 |
| | | | | | |||||
| | | * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 6 | -111/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 3 | -1/+133 |
| | | | | | |||||
| * | | | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 3 | -1/+133 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 32 | -810/+983 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 28 | -779/+954 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 28 | -780/+956 |
| | | |\ \ \ | | | |/ / | | | | | | | | | | | dev-appearance | ||||
| | | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 28 | -779/+955 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | | * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 3 | -4/+7 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -17/+62 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -3/+3 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -13/+17 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -4/+15 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -0/+27 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -48/+76 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -0/+301 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 2 | -3/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 3 | -14/+18 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -0/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -8/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 4 | -44/+101 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-17 | 3 | -120/+86 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-17 | 4 | -5/+105 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-16 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-16 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 3 | -10/+13 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 6 | -11/+33 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 2 | -1/+23 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 3 | -38/+41 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 1 | -3/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 11 | -143/+189 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 2 | -0/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-15 | 1 | -0/+80 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |